[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-dev] Commit Complete
Commit by : alex
Repository : xara
Revision : 708
Date : Wed Mar 22 15:58:42 GMT 2006
Changed paths:
M /Trunk/XaraLX/wxOil/Makefile.am
M /Trunk/XaraLX/wxOil/camresource.cpp
M /Trunk/XaraLX/wxOil/dlgevt.cpp
M /Trunk/XaraLX/wxOil/dlgevt.h
M /Trunk/XaraLX/wxOil/dlgmgr.cpp
M /Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
Enabled kernel rendered dialogs (GRenderRegion tested, but OSRenderRegion should work too).
Diff:
Index: Trunk/XaraLX/wxOil/camresource.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camresource.cpp (revision 707)
+++ Trunk/XaraLX/wxOil/camresource.cpp (revision 708)
@@ -112,6 +112,7 @@
//#include "camconfig.h"
#include "camresource.h"
#include "cartctl.h"
+#include "drawctl.h"
#include "colourmat.h"
#include "camelot.h"
@@ -1393,6 +1394,7 @@
// Initialize the handlers
wxXmlResource::Get()->InitAllHandlers();
wxXmlResource::Get()->AddHandler(new wxCamArtControlXmlHandler);
+ wxXmlResource::Get()->AddHandler(new wxCamDrawControlXmlHandler);
if (!pwxFileSystem) pwxFileSystem = new wxFileSystem;
if (!pwxFileSystem)
Index: Trunk/XaraLX/wxOil/dlgevt.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.cpp (revision 707)
+++ Trunk/XaraLX/wxOil/dlgevt.cpp (revision 708)
@@ -150,10 +150,12 @@
EVT_MOUSE_EVENTS (DialogEventHandler::MouseEvent)
EVT_CAMDIALOG_DEFERREDMSG (wxID_ANY, DialogEventHandler::CamDialogEvent)
EVT_CAMDIALOG_GRIMREAPER (wxID_ANY, DialogEventHandler::GrimReaperEvent)
+ EVT_CAMDIALOG_REDRAW (wxID_ANY, DialogEventHandler::CamDialogEvent)
END_EVENT_TABLE();
DEFINE_EVENT_TYPE(wxEVT_CAMDIALOG_DEFERREDMSG)
DEFINE_EVENT_TYPE(wxEVT_CAMDIALOG_GRIMREAPER)
+DEFINE_EVENT_TYPE(wxEVT_CAMDIALOG_REDRAW)
IMPLEMENT_DYNAMIC_CLASS( wxCamDialogEvent, wxEvent )
/********************************************************************************************
@@ -676,6 +678,7 @@
// And now our own...
HASHEVENTNAME(wxEVT_CAMDIALOG_DEFERREDMSG);
+ HASHEVENTNAME(wxEVT_CAMDIALOG_REDRAW);
TRACE(_T(">>> Event name %d=%s"),wxEVT_COMMAND_BUTTON_CLICKED,GetEventName(wxEVT_COMMAND_BUTTON_CLICKED));
Index: Trunk/XaraLX/wxOil/Makefile.am
===================================================================
--- Trunk/XaraLX/wxOil/Makefile.am (revision 707)
+++ Trunk/XaraLX/wxOil/Makefile.am (revision 708)
@@ -35,6 +35,7 @@
dlgevt.cpp cartprov.cpp cartctl.cpp colourmat.cpp menucmds.cpp menupref.cpp \
rendwnd.cpp scroller.cpp helpuser.cpp oilprefs.cpp dragtrgt.cpp \
ctrllist.cpp dlgcol.cpp thumb.cpp dragmgr.cpp ccolbar.cpp dragcol.cpp \
+ drawctl.cpp \
resources.cpp
# Keep resources.cpp (the autogenerated resource file) on a separate line.
Index: Trunk/XaraLX/wxOil/dlgevt.h
===================================================================
--- Trunk/XaraLX/wxOil/dlgevt.h (revision 707)
+++ Trunk/XaraLX/wxOil/dlgevt.h (revision 708)
@@ -102,6 +102,7 @@
#include <wx/wxprec.h>
#include <wx/event.h>
+#include "drawctl.h"
#include "ccobject.h"
#include "dlgtypes.h"
#include "msg.h"
@@ -145,7 +146,6 @@
void WindowDestroyEvent(wxWindowDestroyEvent &event);
void CamDialogEvent(wxCamDialogEvent &event);
-
void GrimReaperEvent(wxCamDialogEvent &event);
static inline const TCHAR * GetEventName(WXTYPE EventNum) // Return the EventName
@@ -208,12 +208,15 @@
BEGIN_DECLARE_EVENT_TYPES()
DECLARE_EVENT_TYPE(wxEVT_CAMDIALOG_DEFERREDMSG, 1001)
DECLARE_EVENT_TYPE(wxEVT_CAMDIALOG_GRIMREAPER, 1002)
+ DECLARE_EVENT_TYPE(wxEVT_CAMDIALOG_REDRAW, 1003)
END_DECLARE_EVENT_TYPES()
#define EVT_CAMDIALOG_DEFERREDMSG(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_CAMDIALOG_DEFERREDMSG, id, -1, \
(wxObjectEventFunction)(wxEventFunction)(wxCamDialogEventFunction) &fn, (wxObject *) NULL),
#define EVT_CAMDIALOG_GRIMREAPER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_CAMDIALOG_GRIMREAPER, id, -1, \
(wxObjectEventFunction)(wxEventFunction)(wxCamDialogEventFunction) &fn, (wxObject *) NULL),
+#define EVT_CAMDIALOG_REDRAW(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_CAMDIALOG_REDRAW, id, -1, \
+ (wxObjectEventFunction)(wxEventFunction)(wxCamDialogEventFunction) &fn, (wxObject *) NULL),
#endif
Index: Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/bfxrc.xrc (revision 708)
@@ -6,14 +6,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_FLIPX">
@@ -47,14 +47,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxCheckBox" name="IDC_BFXDLG_INTERP">
@@ -98,14 +98,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -143,14 +143,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -184,7 +184,7 @@
<pos>90,114d</pos> <size>87,10d</size>
<label>To 16 col (d&iffusion)</label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_OCTREECOLOUR">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_OCTREECOLOUR">
<pos>90,136d</pos> <size>91,10d</size>
</object>
<title>Colour depth</title>
@@ -195,14 +195,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -258,14 +258,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -351,14 +351,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxRadioButton" name="IDC_BFXDLG_FLIPX">
@@ -408,14 +408,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxCheckBox" name="IDC_BFXDLG_INTERP">
@@ -475,14 +475,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -539,14 +539,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
@@ -608,14 +608,14 @@
<pos>2,3d</pos> <size>80,73d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW">
<pos>8,6d</pos> <size>70,67d</size>
</object>
<object class="wxStaticText" name="IDC_BFXDLG_ORIGFRAME2">
<pos>98,2d</pos> <size>79,74d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_BFXDLG_ORIGREDRAW2">
+ <object class="wxCamDrawControl" name="IDC_BFXDLG_ORIGREDRAW2">
<pos>102,6d</pos> <size>71,65d</size>
</object>
<object class="wxComboBox" name="IDC_BFXDLG_ORIGCOMBO">
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlg.xrc (revision 708)
@@ -86,7 +86,7 @@
<pos>12,6d</pos> <size>90,8d</size>
<label>Show preview</label>
</object>
- <object class="wxStaticBitmap" name="IDC_PREVIEW">
+ <object class="wxCamDrawControl" name="IDC_PREVIEW">
<pos>11,17d</pos> <size>91,83d</size>
</object>
<object class="wxButton" name="ID_CC_HELP_BUTTON">
Index: Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/bmapprev.xrc (revision 708)
@@ -284,7 +284,7 @@
<object class="wxTextCtrl" name="IDC_BLUE_EDIT">
<pos>111,71d</pos> <size>24,12d</size>
</object>
- <object class="wxStaticBitmap" name="IDC_T2_PALETTE_CONTROL">
+ <object class="wxCamDrawControl" name="IDC_T2_PALETTE_CONTROL">
<pos>142,7d</pos> <size>221,62d</size>
</object>
<object class="wxCamArtControl" name="IDC_T2_LOCKED_COLOUR">
Index: Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/tracerc.xrc (revision 708)
@@ -18,14 +18,14 @@
<pos>2,3d</pos> <size>124,123d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_TRACER_ORIGREDRAW">
+ <object class="wxCamDrawControl" name="IDC_TRACER_ORIGREDRAW">
<pos>4,5d</pos> <size>120,119d</size>
</object>
<object class="wxStaticText" name="IDC_TRACER_3DFRAMEP">
<pos>134,3d</pos> <size>124,123d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_TRACER_DESTREDRAW">
+ <object class="wxCamDrawControl" name="IDC_TRACER_DESTREDRAW">
<pos>136,5d</pos> <size>120,119d</size>
</object>
<object class="wxStaticText" name="IDC_TRACER_BLURTXT">
Index: Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/biasres.xrc (revision 708)
@@ -23,10 +23,10 @@
<pos>34,8d</pos> <size>63,57d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_CURVE">
+ <object class="wxCamDrawControl" name="IDC_CURVE">
<pos>34,8d</pos> <size>63,57d</size>
</object>
- <object class="wxStaticBitmap" name="IDC_CURVEINTERPOLATE">
+ <object class="wxCamDrawControl" name="IDC_CURVEINTERPOLATE">
<pos>7,69d</pos> <size>110,15d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC10">
Index: Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/rikdlg.xrc (revision 708)
@@ -14,7 +14,7 @@
<pos>5,5d</pos> <size>160,160d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_REDRAW_ME">
+ <object class="wxCamDrawControl" name="IDC_REDRAW_ME">
<pos>10,10d</pos> <size>150,150d</size>
</object>
<object class="wxButton" name="IDC_REDRAWBTN">
Index: Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/colordlg.xrc (revision 708)
@@ -17,7 +17,7 @@
<pos>122,4d</pos> <size>18,14d</size>
<label>-</label>
</object>
- <object class="wxStaticBitmap" name="IDC_COLOURPICKER">
+ <object class="wxCamDrawControl" name="IDC_COLOURPICKER">
<pos>6,22d</pos> <size>14,14d</size>
</object>
<object class="wxTextCtrl" name="IDC_EDIT_COMPONENT1">
@@ -70,7 +70,7 @@
<pos>80,248d</pos> <size>48,10d</size>
<label>Comp 4</label>
</object>
- <object class="wxStaticBitmap" name="IDC_EDIT_PICKER">
+ <object class="wxCamDrawControl" name="IDC_EDIT_PICKER">
<pos>4,20d</pos> <size>134,104d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/eddlg.xrc (revision 708)
@@ -49,7 +49,7 @@
<pos>4,5d</pos> <size>105,76d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_ALIGNDIALOG_DIAGRAM">
+ <object class="wxCamDrawControl" name="IDC_ALIGNDIALOG_DIAGRAM">
<pos>6,6d</pos> <size>102,74d</size>
</object>
<title>Object Alignment</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutrsw.xrc (revision 708)
@@ -26,7 +26,7 @@
<pos>29,14d</pos> <size>131,8d</size>
<label>Copyright ? 1997 Xara Ltd.</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE1">
+ <object class="wxCamDrawControl" name="IDC_STRIPE1">
<pos>4,44d</pos> <size>196,1d</size>
</object>
<object class="wxStaticText" name="IDC_LICENSEE">
@@ -41,7 +41,7 @@
<pos>60,71d</pos> <size>132,8d</size>
<label>+ 44 1442 351000</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE2">
+ <object class="wxCamDrawControl" name="IDC_STRIPE2">
<pos>4,85d</pos> <size>196,1d</size>
</object>
<object class="wxStaticText" name="IDC_CAMHOST">
Index: Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/exprwres.xrc (revision 708)
@@ -6,7 +6,7 @@
<pos>6,1d</pos> <size>167,150d</size>
<label>Image A (0%) SELECTED</label>
</object>
- <object class="wxStaticBitmap" name="IDC_REDRAW1">
+ <object class="wxCamDrawControl" name="IDC_REDRAW1">
<pos>13,14d</pos> <size>155,111d</size>
</object>
<object class="wxStaticText" name="IDC_IMAGESIZE1">
@@ -28,7 +28,7 @@
<pos>213,0d</pos> <size>165,151d</size>
<label>Image B (0%)</label>
</object>
- <object class="wxStaticBitmap" name="IDC_REDRAW2">
+ <object class="wxCamDrawControl" name="IDC_REDRAW2">
<pos>218,14d</pos> <size>155,111d</size>
</object>
<object class="wxStaticText" name="IDC_IMAGESIZE2">
Index: Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/webdlgw.xrc (revision 708)
@@ -66,7 +66,7 @@
<pos>12,6d</pos> <size>90,8d</size>
<label>Show &preview bitmap</label>
</object>
- <object class="wxStaticBitmap" name="IDC_PREVIEW">
+ <object class="wxCamDrawControl" name="IDC_PREVIEW">
<pos>12,20d</pos> <size>91,83d</size>
</object>
<object class="wxButton" name="ID_CC_HELP_BUTTON">
Index: Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/tipsdlg.xrc (revision 708)
@@ -2,13 +2,13 @@
<resource>
<object class="wxDialog" name="IDD_TIP">
<pos>0,0d</pos> <size>242,184d</size>
- <object class="wxStaticBitmap" name="-1">
+ <object class="wxCamDrawControl" name="-1">
<pos>11,11d</pos> <size>219,130d</size>
</object>
- <object class="wxStaticBitmap" name="IDC_BITMAP">
+ <object class="wxCamDrawControl" name="IDC_BITMAP">
<pos>11,11d</pos> <size>50,130d</size>
</object>
- <object class="wxStaticBitmap" name="IDC_DIDYOUKNOW">
+ <object class="wxCamDrawControl" name="IDC_DIDYOUKNOW">
<pos>61,17d</pos> <size>169,32d</size>
</object>
<object class="wxButton" name="wxID_OK">
Index: Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/aboutres.xrc (revision 708)
@@ -26,7 +26,7 @@
<pos>29,14d</pos> <size>131,8d</size>
<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE1">
+ <object class="wxCamDrawControl" name="IDC_STRIPE1">
<pos>4,40d</pos> <size>216,1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -53,7 +53,7 @@
<pos>80,67d</pos> <size>102,8d</size>
<label>+ 44 1442 351000</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE2">
+ <object class="wxCamDrawControl" name="IDC_STRIPE2">
<pos>4,81d</pos> <size>216,1d</size>
</object>
<title>About Xara Xtreme</title>
@@ -84,7 +84,7 @@
<pos>29,14d</pos> <size>131,8d</size>
<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE1">
+ <object class="wxCamDrawControl" name="IDC_STRIPE1">
<pos>4,40d</pos> <size>216,1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -111,7 +111,7 @@
<pos>80,67d</pos> <size>102,8d</size>
<label>+ 44 1442 351000</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE2">
+ <object class="wxCamDrawControl" name="IDC_STRIPE2">
<pos>4,81d</pos> <size>216,1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -150,7 +150,7 @@
<pos>29,14d</pos> <size>131,8d</size>
<label>Copyright ? 1994-2005 Xara Group Ltd.</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE1">
+ <object class="wxCamDrawControl" name="IDC_STRIPE1">
<pos>4,40d</pos> <size>216,1d</size>
</object>
<object class="wxStaticText" name="IDC_STATIC">
@@ -177,7 +177,7 @@
<pos>80,67d</pos> <size>102,8d</size>
<label>+ 44 1442 351000</label>
</object>
- <object class="wxStaticBitmap" name="IDC_STRIPE2">
+ <object class="wxCamDrawControl" name="IDC_STRIPE2">
<pos>4,81d</pos> <size>216,1d</size>
</object>
<title>About Xara XS</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/prevwres.xrc (revision 708)
@@ -46,7 +46,7 @@
<pos>5,45d</pos> <size>210,160d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_REDRAW_ME">
+ <object class="wxCamDrawControl" name="IDC_REDRAW_ME">
<pos>10,50d</pos> <size>200,150d</size>
</object>
<title>Preview</title>
Index: Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/rotatini.xrc (revision 708)
@@ -2,7 +2,7 @@
<resource>
<object class="wxDialog" name="IDD_ROTATETOOL">
<pos>0,0d</pos> <size>185,28d</size>
- <object class="wxStaticBitmap" name="IDC_ROTATEGRID">
+ <object class="wxCamDrawControl" name="IDC_ROTATEGRID">
<pos>61,6d</pos> <size>13,13d</size>
</object>
<title></title>
Index: Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/coldlgw.xrc (revision 708)
@@ -64,7 +64,7 @@
<pos>84,231d</pos> <size>48,10d</size>
<label>Comp 4</label>
</object>
- <object class="wxStaticBitmap" name="IDC_EDIT_PICKER">
+ <object class="wxCamDrawControl" name="IDC_EDIT_PICKER">
<pos>4,20d</pos> <size>134,104d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/xrc/EN/galres.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 707)
+++ Trunk/XaraLX/wxOil/xrc/EN/galres.xrc (revision 708)
@@ -353,7 +353,7 @@
<pos>107,20d</pos> <size>50,14d</size>
<label>&Cancel</label>
</object>
- <object class="wxStaticBitmap" name="IDC_COLNAME_PATCH">
+ <object class="wxCamDrawControl" name="IDC_COLNAME_PATCH">
<pos>8,20d</pos> <size>12,12d</size>
</object>
<title>Rename colour style</title>
@@ -410,7 +410,7 @@
<pos>7,1d</pos> <size>130,50d</size>
<label></label>
</object>
- <object class="wxStaticBitmap" name="IDC_SGLINEPROPERTIES_DIAGRAM">
+ <object class="wxCamDrawControl" name="IDC_SGLINEPROPERTIES_DIAGRAM">
<pos>9,7d</pos> <size>126,42d</size>
</object>
<object class="wxStaticBox" name="IDC_STATIC">
Index: Trunk/XaraLX/wxOil/dlgmgr.cpp
===================================================================
--- Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 707)
+++ Trunk/XaraLX/wxOil/dlgmgr.cpp (revision 708)
@@ -915,7 +915,7 @@
HandleMessage = TRUE;
}
else if (
- ((EventType == wxEVT_PAINT) && (pGadget)) ||
+ ((EventType == wxEVT_CAMDIALOG_REDRAW) && (pGadget)) ||
FALSE)
{
if (CCamApp::IsDisabled())
Xara