Changes mostly as a result of __WXSTUBS__ compilation. The stubs code now

compiles under Windows with VC++. Also OGL enhancements espec. wxDrawnShape.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/symbols.txt b/docs/symbols.txt
index 40c205c89721ba6a2b377219f64c94fc50d5ba06..bee97d122b676476cdaca3ff2ebf1b17499cdb40 100644 (file)
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -4,17 +4,18 @@ GUIs:
 -----
 
 __X__           any X, but not GTK
 -----
 
 __X__           any X, but not GTK

-__WXMOTIF__       Motif
-__XT__          Xt; mutually exclusive with WX_MOTIF (?)
-__WXGTK__         GTK
-__XVIEW__       Obsolete!
-__WXMSW__     Any Windows
-__MAC__         MacOS
+__WXMOTIF__     Motif
+__WXXT__        Xt; mutually exclusive with WX_MOTIF (?)
+__WXGTK__       GTK
+__WXMSW__       Any Windows
+__WXMAC__       MacOS

 __UNIX__        any Unix
 __UNIX__        any Unix

+__WINDOWS__     any Windows

 __WIN95__       GUI for Windows 95 and above; NT 4.0 and above.
 __WIN32__       WIN32 API
 __NT__          Windows NT
 __WIN95__       GUI for Windows 95 and above; NT 4.0 and above.
 __WIN32__       WIN32 API
 __NT__          Windows NT

-__CURSES__      CURSES
+__WXCURSES__    CURSES
+__WXSTUBS__     Stubbed version ('template' wxWin implementation)

 
 In fact, they should better all start with __WX instead of __ only. 
 The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
 
 In fact, they should better all start with __WX instead of __ only. 
 The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__

diff --git a/include/wx/accel.h b/include/wx/accel.h
new file mode 100644 (file)
index 0000000..a36d4a0
--- /dev/null
+++ b/include/wx/accel.h
@@ -0,0 +1,19 @@
+#ifndef _WX_ACCEL_H_BASE_
+#define _WX_ACCEL_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/accel.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/accel.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/accel.h"
+#elif defined(__WXQT__)
+#include "wx/qt/accel.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/accel.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/accel.h"
+#endif
+
+#endif
+    // _WX_ACCEL_H_BASE_

diff --git a/include/wx/app.h b/include/wx/app.h
index 5bfeb5db301e5e02c1aeab47e16f319f62145d42..d454acf6fa39371bbc875ecffc828899b6c09620 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __APPH_BASE__
-#define __APPH_BASE__
+#ifndef _WX_APP_H_BASE_
+#define _WX_APP_H_BASE_

 
 #ifdef __WXMSW__
 class WXDLLEXPORT wxApp;
 
 #ifdef __WXMSW__
 class WXDLLEXPORT wxApp;


@@ -26,14 +26,17 @@ typedef wxObject* (*wxAppInitializerFunction) (void);  // returning wxApp* won't
 #if defined(__WXMSW__)
 #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)
 #if defined(__WXMSW__)
 #include "wx/msw/app.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/app.h"
+#include "wx/motif/app.h"

 #elif defined(__WXQT__)
 #include "wx/qt/app.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/app.h"
 #elif defined(__WXQT__)
 #include "wx/qt/app.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/app.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/app.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/app.h"

 #endif
 
 #endif
 

-

 // Having a global instance of this class allows
 // wxApp to be aware of the app creator function.
 // wxApp can then call this function to create a new
 // Having a global instance of this class allows
 // wxApp to be aware of the app creator function.
 // wxApp can then call this function to create a new


@@ -72,4 +75,4 @@ int main(int argc, char *argv[]) { return wxEntry(argc, argv); }
 
 
 #endif
 
 
 #endif

-    // __APPH_BASE__
+    // _WX_APP_H_BASE_

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 2d5ad42e0c8ed1758faec87d092c1f4b9b2ad399..f031e7041aeb319b6b7f9e5dd3baa7d75c9dda0b 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -1,15 +1,19 @@
-#ifndef __BITMAPH_BASE__
-#define __BITMAPH_BASE__
+#ifndef _WX_BITMAP_H_BASE_
+#define _WX_BITMAP_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/bitmap.h"
+#include "wx/motif/bitmap.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bitmap.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/bitmap.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/bitmap.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __BITMAPH_BASE__
+    // _WX_BITMAP_H_BASE_

diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 435220473ee48b7ff96c171b4d10be0e197dd100..2ff65ebbb254b11a92330021addbd4943f6d8770 100644 (file)
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -1,14 +1,18 @@
-#ifndef __BMPBUTTONH_BASE__
-#define __BMPBUTTONH_BASE__
+#ifndef _WX_BMPBUTTON_H_BASE_
+#define _WX_BMPBUTTON_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/bmpbuttn.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/bmpbuttn.h"
+#include "wx/motif/bmpbuttn.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/bmpbuttn.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bmpbuttn.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bmpbuttn.h"
 #elif defined(__WXQT__)
 #include "wx/qt/bmpbuttn.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/bmpbuttn.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/bmpbuttn.h"

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/brush.h b/include/wx/brush.h
index f29460b1c92ab6c1594c603f4e5b5cb0d3c92c72..e5d99b39a18bd282f23ac6d3c11c1f9a41ead65f 100644 (file)
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,15 +1,19 @@
-#ifndef __BRUSHH_BASE__
-#define __BRUSHH_BASE__
+#ifndef _WX_BRUSH_H_BASE_
+#define _WX_BRUSH_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/brush.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/brush.h"
+#include "wx/motif/brush.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
 #elif defined(__WXQT__)
 #include "wx/qt/brush.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/brush.h"
 #elif defined(__WXQT__)
 #include "wx/qt/brush.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/brush.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/brush.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __BRUSHH_BASE__
+    // _WX_BRUSH_H_BASE_

diff --git a/include/wx/button.h b/include/wx/button.h
index 096f189abc2a5748f00beee5d89ac03b8acb6b5e..454a0a58f6c3c4868d458019ddbb8b8dac55d607 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -1,15 +1,19 @@
-#ifndef __BUTTONH_BASE__
-#define __BUTTONH_BASE__
+#ifndef _WX_BUTTON_H_BASE_
+#define _WX_BUTTON_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/button.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/button.h"
+#include "wx/motif/button.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/button.h"
 #elif defined(__WXQT__)
 #include "wx/qt/button.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/button.h"
 #elif defined(__WXQT__)
 #include "wx/qt/button.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/button.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/button.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __BUTTONH_BASE__
+    // _WX_BUTTON_H_BASE_

diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 70451f88a668f391f0bdb56e6505c2f42b8cf1c0..47895df8cd97c84ef596caa8e88129fc12e6f5b1 100644 (file)
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -1,15 +1,19 @@
-#ifndef __CHECKBOXH_BASE__
-#define __CHECKBOXH_BASE__
+#ifndef _WX_CHECKBOX_H_BASE_
+#define _WX_CHECKBOX_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/checkbox.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/checkbox.h"
+#include "wx/motif/checkbox.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/checkbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/checkbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/checkbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/checkbox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/checkbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/checkbox.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CHECKBOXH_BASE__
+    // _WX_CHECKBOX_H_BASE_

diff --git a/include/wx/checklst.h b/include/wx/checklst.h
new file mode 100644 (file)
index 0000000..96f31e4
--- /dev/null
+++ b/include/wx/checklst.h
@@ -0,0 +1,19 @@
+#ifndef _WX_CHECKLST_H_BASE_
+#define _WX_CHECKLST_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/checklst.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/checklst.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/checklst.h"
+#elif defined(__WXQT__)
+#include "wx/qt/checklst.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/checklst.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/checklst.h"
+#endif
+
+#endif
+    // _WX_CHECKLST_H_BASE_

diff --git a/include/wx/choicdlg.h b/include/wx/choicdlg.h
index 88153df70ece2254141763228bcc0cea1348e5da..52439ffd71489777e58ceca15470a126a154935e 100644 (file)
--- a/include/wx/choicdlg.h
+++ b/include/wx/choicdlg.h
@@ -1,7 +1,7 @@
-#ifndef __CHOICDLGH_BASE__
-#define __CHOICDLGH_BASE__
+#ifndef _WX_CHOICDLG_H_BASE_
+#define _WX_CHOICDLG_H_BASE_

 
 #include "wx/generic/choicdgg.h"
 
 #endif
 
 #include "wx/generic/choicdgg.h"
 
 #endif

-    // __CHOICDLGH_BASE__
+    // _WX_CHOICDLG_H_BASE_

diff --git a/include/wx/choice.h b/include/wx/choice.h
index a6b981d746f06060e96bc82c4030a014ffacac1f..1830d779aa2a6456505d1cdaeed2b3eac4001eed 100644 (file)
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -1,15 +1,19 @@
-#ifndef __CHOICEH_BASE__
-#define __CHOICEH_BASE__
+#ifndef _WX_CHOICE_H_BASE_
+#define _WX_CHOICE_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/choice.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/choice.h"
+#include "wx/motif/choice.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/choice.h"
 #elif defined(__WXQT__)
 #include "wx/qt/choice.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/choice.h"
 #elif defined(__WXQT__)
 #include "wx/qt/choice.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/choice.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/choice.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CHOICEH_BASE__
+    // _WX_CHOICE_H_BASE_

diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 91ff8467002002f5cbde1828a96a029daa7cce9c..c37f46116fd27afdc5d68ec418703d37244362cc 100644 (file)
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -1,15 +1,19 @@
-#ifndef __CLIPBRDH_BASE__
-#define __CLIPBRDH_BASE__
+#ifndef _WX_CLIPBRD_H_BASE_
+#define _WX_CLIPBRD_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/clipbrd.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/clipbrd.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/clipbrd.h"
+#include "wx/motif/clipbrd.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/clipbrd.h"
 #elif defined(__WXQT__)
 #include "wx/gtk/clipbrd.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/clipbrd.h"
 #elif defined(__WXQT__)
 #include "wx/gtk/clipbrd.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/clipbrd.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/clipbrd.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CLIPBRDH_BASE__
+    // _WX_CLIPBRD_H_BASE_

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index bb02f9ec6c0a4286a9d62470a1c528412091d654..dc4eeb3ee03a3b47ecd2c8fa626307c4a3adcfd2 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -9,13 +9,16 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __CMNDATAH_BASE__
-#define __CMNDATAH_BASE__
+#ifndef _WX_CMNDATA_H_BASE_
+#define _WX_CMNDATA_H_BASE_

 
 #ifdef __GNUG__
 #pragma interface "cmndata.h"
 #endif
 
 
 #ifdef __GNUG__
 #pragma interface "cmndata.h"
 #endif
 

+#include "wx/font.h"
+#include "wx/colour.h"
+

 class WXDLLEXPORT wxColourData: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxColourData)
 class WXDLLEXPORT wxColourData: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxColourData)


@@ -220,4 +223,4 @@ class WXDLLEXPORT wxPageSetupData: public wxObject
 
 
 #endif
 
 
 #endif

-    // __CMNDATAH_BASE__
+    // _WX_CMNDATA_H_BASE_

diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index d2453d9a0ef8d138c94e22a1248af4a77bdec1fd..977c8e5bdee1c1a3c9a0a81d8bc47733acf876ae 100644 (file)
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,5 +1,5 @@
-#ifndef __COLORDLGH_BASE__
-#define __COLORDLGH_BASE__
+#ifndef _WX_COLORDLG_H_BASE_
+#define _WX_COLORDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/colordlg.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/colordlg.h"


@@ -9,7 +9,11 @@
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/colrdlgg.h"
 #include "wx/generic/colrdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/colrdlgg.h"

+#elif defined(__WXMAC__)
+#include "wx/generic/colrdlgg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/colrdlgg.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __COLORDLGH_BASE__
+    // _WX_COLORDLG_H_BASE_

diff --git a/include/wx/colour.h b/include/wx/colour.h
new file mode 100644 (file)
index 0000000..88b50af
--- /dev/null
+++ b/include/wx/colour.h
@@ -0,0 +1,19 @@
+#ifndef _WX_COLOUR_H_BASE_
+#define _WX_COLOUR_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/colour.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/colour.h"
+#elif defined(__WXGTK__)
+#include "wx/gtk/colour.h"
+#elif defined(__WXQT__)
+#include "wx/qt/colour.h"
+#elif defined(__WXMAC__)
+#include "wx/mac/colour.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/colour.h"
+#endif
+
+#endif
+    // _WX_COLOUR_H_BASE_

diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index e5ffb31efc7db2d0100dbf58408866ab238145a4..26512aa0cd5460a5e01da7dbd269b946e2329a57 100644 (file)
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -1,15 +1,19 @@
-#ifndef __COMBOBOXH_BASE__
-#define __COMBOBOXH_BASE__
+#ifndef _WX_COMBOBOX_H_BASE_
+#define _WX_COMBOBOX_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/combobox.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/combobox.h"
+#include "wx/motif/combobox.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/combobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/combobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/combobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/combobox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/combobox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/combobox.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __COMBOBOXH_BASE__
+    // _WX_COMBOBOX_H_BASE_

diff --git a/include/wx/config.h b/include/wx/config.h
index f5b1b195eb94a5965aa1b21bc402570e3e2a1e3f..6f1adce1c8e59ba8c09c273b0c3cf0ed885084af 100644 (file)
--- a/include/wx/config.h
+++ b/include/wx/config.h
@@ -11,8 +11,8 @@
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef   _wxCONFIG_H
-#define   _wxCONFIG_H
+#ifndef   _WX_CONFIG_H_
+#define   _WX_CONFIG_H_

 
 #ifdef __GNUG__
 #pragma interface "config.h"
 
 #ifdef __GNUG__
 #pragma interface "config.h"


@@ -237,5 +237,5 @@ private:
   #define wxConfig  wxFileConfig
 #endif
 
   #define wxConfig  wxFileConfig
 #endif
 

-#endif  //_wxCONFIG_H
+#endif  // _WX_CONFIG_H_

 
 

diff --git a/include/wx/control.h b/include/wx/control.h
index e6a4b8fed2d5796edc931f127939c7d6788bad23..e4341393e83ba945a9ecea97d788527b8f32140c 100644 (file)
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -1,15 +1,19 @@
-#ifndef __CONTROLH_BASE__
-#define __CONTROLH_BASE__
+#ifndef _WX_CONTROL_H_BASE_
+#define _WX_CONTROL_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/control.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/control.h"
+#include "wx/motif/control.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/control.h"
 #elif defined(__WXQT__)
 #include "wx/qt/control.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/control.h"
 #elif defined(__WXQT__)
 #include "wx/qt/control.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/control.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/control.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CONTROLH_BASE__
+    // _WX_CONTROL_H_BASE_

diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f9dafb81a7cd6fdcebe2bdb6e53aba2d7d49df85..4ebe73a97139eff5fe41c323ca03fa0364c3eeb7 100644 (file)
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -1,15 +1,19 @@
-#ifndef __CURSORH_BASE__
-#define __CURSORH_BASE__
+#ifndef _WX_CURSOR_H_BASE_
+#define _WX_CURSOR_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/cursor.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/cursor.h"
+#include "wx/motif/cursor.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
 #elif defined(__WXQT__)
 #include "wx/qt/cursor.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/cursor.h"
 #elif defined(__WXQT__)
 #include "wx/qt/cursor.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/cursor.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/cursor.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __CURSORH_BASE__
+    // _WX_CURSOR_H_BASE_

diff --git a/include/wx/date.h b/include/wx/date.h
index d0a47dc705a2f50697b69e9d00f872c727b9d0ee..d21a53eb00abb978036d764e0efe3d6d4927b19d 100644 (file)
--- a/include/wx/date.h
+++ b/include/wx/date.h
@@ -10,8 +10,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXDATEH__
-#define __WXDATEH__
+#ifndef _WX_DATE_H_
+#define _WX_DATE_H_

 
 #ifdef __GNUG__
 #pragma interface "date.h"
 
 #ifdef __GNUG__
 #pragma interface "date.h"


@@ -128,4 +128,4 @@ class WXDLLEXPORT wxDate: public wxObject
 
 #endif
 #endif
 
 #endif
 #endif

-    // __WXDATEH__
+    // _WX_DATE_H_

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 8d5b759dcdd150a136c252f0162a92cada8bee31..de87a83323daf2f35cd2d7f0d5276aeb76b689f9 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DATSTREAMH__
-#define __DATSTREAMH__
+#ifndef _WX_DATSTREAM_H_
+#define _WX_DATSTREAM_H_

 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"
 
 #ifdef __GNUG__
 #pragma interface "datstrm.h"


@@ -45,4 +45,4 @@ class wxDataOutputStream: public wxFilterOutputStream {
 };
 
 #endif
 };
 
 #endif

-    // __DATSTREAMH__
+    // _WX_DATSTREAM_H_

diff --git a/include/wx/dc.h b/include/wx/dc.h
index b8a6344145f6d4b3ca682bb1ebd745387a38e7d7..2cf32f30d293fe8987371ea5b1a4c9181dd45246 100644 (file)
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1,15 +1,19 @@
-#ifndef __DCH_BASE__
-#define __DCH_BASE__
+#ifndef _WX_DC_H_BASE_
+#define _WX_DC_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dc.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dc.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dc.h"
+#include "wx/motif/dc.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dc.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dc.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dc.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dc.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dc.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dc.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DCH_BASE__
+    // _WX_DC_H_BASE_

diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index cdd08bc9bdd3ede626fc80df9b77af46402021ee..557e2f4dc21f526cf6366b478cca600254a2f33d 100644 (file)
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -1,15 +1,19 @@
-#ifndef __DCCLIENTH_BASE__
-#define __DCCLIENTH_BASE__
+#ifndef _WX_DCCLIENT_H_BASE_
+#define _WX_DCCLIENT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcclient.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dcclient.h"
+#include "wx/motif/dcclient.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcclient.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcclient.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcclient.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dcclient.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcclient.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DCCLIENTH_BASE__
+    // _WX_DCCLIENT_H_BASE_

diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index f2cb35f3988a8b36987e69e664b95ceea7bb5681..84a814c4d6c65402e4f860b32e210834fd91cbb3 100644 (file)
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,15 +1,19 @@
-#ifndef __DCMEMORYH_BASE__
-#define __DCMEMORYH_BASE__
+#ifndef _WX_DCMEMORY_H_BASE_
+#define _WX_DCMEMORY_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcmemory.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dcmemory.h"
+#include "wx/motif/dcmemory.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcmemory.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcmemory.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcmemory.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dcmemory.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcmemory.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DCMEMORYH_BASE__
+    // _WX_DCMEMORY_H_BASE_

diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index cad351f7d884b9a28f1b5889dc61cc329abacff7..532323e9d25924dfe8aae2e4e447cb7bde60c3da 100644 (file)
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -1,9 +1,9 @@
-#ifndef __DCPRINTH_BASE__
-#define __DCPRINTH_BASE__
+#ifndef _WX_DCPRINT_H_BASE_
+#define _WX_DCPRINT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dcprint.h"
 #endif
 
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcprint.h"
 #endif
 
 #endif

-    // __DCPRINTH_BASE__
+    // _WX_DCPRINT_H_BASE_

diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 7a5c047955073ec7c33615e53626eef54ec4d5a6..bd35719499d2d1b07737a4e3d8aa8026a2e6fe88 100644 (file)
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -1,15 +1,19 @@
-#ifndef __DCSCREENH_BASE__
-#define __DCSCREENH_BASE__
+#ifndef _WX_DCSCREEN_H_BASE_
+#define _WX_DCSCREEN_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dcscreen.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dcscreen.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dcscreen.h"
+#include "wx/motif/dcscreen.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcscreen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dcscreen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dcscreen.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dcscreen.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dcscreen.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DCSCREENH_BASE__
+    // _WX_DCSCREEN_H_BASE_

diff --git a/include/wx/dde.h b/include/wx/dde.h
index 38848db1b3e78f5f82972b10cf5f43119f819c44..908fb09388761e40bfe9ad99bd782aa4c4c6edd2 100644 (file)
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -1,15 +1,19 @@
-#ifndef __DDEH_BASE__
-#define __DDEH_BASE__
+#ifndef _WX_DDE_H_BASE_
+#define _WX_DDE_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dde.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dde.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dde.h"
+#include "wx/motif/dde.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dde.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dde.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dde.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dde.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dde.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DDEH_BASE__
+    // _WX_DDE_H_BASE_

diff --git a/include/wx/debug.h b/include/wx/debug.h
index 2f65767f4ec7f1ce053151b69fa543cdf6b4d8ab..2c778e0a7f19942df1eaead38c7d5ef611cd418d 100644 (file)
--- a/include/wx/debug.h
+++ b/include/wx/debug.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   __WXDEBUGH__
-#define   __WXDEBUGH__
+#ifndef   _WX_DEBUG_H_
+#define   _WX_DEBUG_H_

 
 #include  <assert.h>
 
 
 #include  <assert.h>
 


@@ -99,5 +99,5 @@
 
 //@}
 
 
 //@}
 

-#endif  // __WXDEBUGH__
+#endif  // _WX_DEBUG_H_

 
 

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 092b883901aa1b11678fc64561303586722c32b7..456eb162ed2695bf835428c0160785a512887fa2 100644 (file)
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DEFSH__
-#define __DEFSH__
+#ifndef _WX_DEFS_H_
+#define _WX_DEFS_H_

 
 #ifdef __GNUG__
 #pragma interface "defs.h"
 
 #ifdef __GNUG__
 #pragma interface "defs.h"


@@ -48,14 +48,10 @@
 #endif
 #if defined(__WXMOTIF__)
 # define __X__
 #endif
 #if defined(__WXMOTIF__)
 # define __X__

-#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) 
-# ifndef __WXMSW__
-#  define __WXMSW__
-# endif

 #endif
 
 // wxWindows checks for WIN32, not __WIN32__
 #endif
 
 // wxWindows checks for WIN32, not __WIN32__

-#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__))
+#if ((defined(WIN32) || defined(__NT__)) && !defined(__WIN32__) && !defined(__WXSTUBS__))

 #define __WIN32__
 #endif
 
 #define __WIN32__
 #endif
 


@@ -71,11 +67,11 @@
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \
 #if defined(__WXMSW__) && defined(__X__)
 # error "Target can't be both X and Windows"
 #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \

-      !defined(__MAC__) && !defined(__X__) && !defined(__WXQT__)
-#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__|__QT__]"
+      !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]"

 #endif
 
 #endif
 

-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__)

 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;
 
 // Bool is now obsolete, use bool instead
 // typedef int Bool;


@@ -236,10 +232,6 @@ enum  ErrCode
 #endif
 
 #ifndef __UNIX__                     // Windows
 #endif
 
 #ifndef __UNIX__                     // Windows

-  #ifndef __WXMSW__
-    #define __WXMSW__
-  #endif
-

   #if   defined(_MSC_VER)
     #define __VISUALC__
   #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
   #if   defined(_MSC_VER)
     #define __VISUALC__
   #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)


@@ -257,7 +249,7 @@ enum  ErrCode
 #elif   defined(__WXMSW__)
   #define FILE_PATH_SEPARATOR   ('\\')
 #else
 #elif   defined(__WXMSW__)
   #define FILE_PATH_SEPARATOR   ('\\')
 #else

-  #error "don't know path separator for this platform"
+  #define FILE_PATH_SEPARATOR   ('/')

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -776,20 +768,23 @@ enum _Virtual_keycodes {
 // OS mnemonics -- Identify the running OS (useful for Windows)
 // [Not all platforms are currently available or supported]
 enum {
 // OS mnemonics -- Identify the running OS (useful for Windows)
 // [Not all platforms are currently available or supported]
 enum {

-  wxCURSES,
+  wxUNKNOWN_PLATFORM,
+  wxCURSES,     // Text-only CURSES

   wxXVIEW_X,   // Sun's XView OpenLOOK toolkit
   wxMOTIF_X,   // OSF Motif 1.x.x
   wxXVIEW_X,   // Sun's XView OpenLOOK toolkit
   wxMOTIF_X,   // OSF Motif 1.x.x

-  wxCOSE_X,    // OSF Common Desktop Environment
+  wxCOSE_X,        // OSF Common Desktop Environment

   wxNEXTSTEP,  // NeXTStep
   wxMACINTOSH, // Apple System 7
   wxNEXTSTEP,  // NeXTStep
   wxMACINTOSH, // Apple System 7

-  wxGEOS,      // GEOS
-  wxOS2_PM,    // OS/2 Workplace
+  wxGTK,           // GTK
+  wxQT,                // Qt
+  wxGEOS,          // GEOS
+  wxOS2_PM,        // OS/2 Workplace

   wxWINDOWS,   // Windows or WfW
   wxPENWINDOWS,        // Windows for Pen Computing
   wxWINDOWS_NT,        // Windows NT
   wxWINDOWS,   // Windows or WfW
   wxPENWINDOWS,        // Windows for Pen Computing
   wxWINDOWS_NT,        // Windows NT

-  wxWIN32S,    // Windows 32S API
-  wxWIN95,     // Windows 95
-  wxWIN386     // Watcom 32-bit supervisor modus
+  wxWIN32S,        // Windows 32S API
+  wxWIN95,         // Windows 95
+  wxWIN386         // Watcom 32-bit supervisor modus

 };
 
 // Printing
 };
 
 // Printing


@@ -882,4 +877,4 @@ typedef int (__stdcall *WXFARPROC)();
 #endif
 
 #endif
 #endif
 
 #endif

-    // __WXDEFSH__
+    // _WX_DEFS_H_

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 19856d0663415f780a941f373a936b696cc388b2..823d2d4573e6a8d926897ce76ec24760bcf10f99 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -1,15 +1,19 @@
-#ifndef __DIALOGH_BASE__
-#define __DIALOGH_BASE__
+#ifndef _WX_DIALOG_H_BASE_
+#define _WX_DIALOG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dialog.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dialog.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dialog.h"
+#include "wx/motif/dialog.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dialog.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dialog.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dialog.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dialog.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dialog.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dialog.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DIALOGH_BASE__
+    // _WX_DIALOG_H_BASE_

diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 5d601368cf383899c3e203228101f9dd62ead07a..d22d17f544d9298cc83d927079a9d9c4e8b9646e 100644 (file)
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,15 +1,19 @@
-#ifndef __DIRDLGH_BASE__
-#define __DIRDLGH_BASE__
+#ifndef _WX_DIRDLG_H_BASE_
+#define _WX_DIRDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/dirdlg.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/dirdlg.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/dirdlg.h"
+#include "wx/motif/dirdlg.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/dirdlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/dirdlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dirdlg.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dirdlg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dirdlg.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DIRDLGH_BASE__
+    // _WX_DIRDLG_H_BASE_

diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index c9fea4c1678eb747be2fd422a6c6c1a131210e07..84a61155ecab602a0850c220802d7882dc383a69 100644 (file)
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -1,5 +1,5 @@
-#ifndef __DNDH_BASE__
-#define __DNDH_BASE__
+#ifndef _WX_DND_H_BASE_
+#define _WX_DND_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/ole/dropsrc.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/ole/dropsrc.h"


@@ -10,7 +10,11 @@
 #include "wx/gtk/dnd.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dnd.h"
 #include "wx/gtk/dnd.h"
 #elif defined(__WXQT__)
 #include "wx/qt/dnd.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/dnd.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/dnd.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __DNDH_BASE__
+    // _WX_DND_H_BASE_

diff --git a/include/wx/docview.h b/include/wx/docview.h
index add8ef0e19b90a7b1f4287f2e229c4ed80fe36d2..45ed1c3be51c55a0b31a2e38fc6fcbdfd7e4f91c 100644 (file)
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __DOCH__
-#define __DOCH__
+#ifndef _WX_DOCH__
+#define _WX_DOCH__

 
 #ifdef __GNUG__
 #pragma interface "docview.h"
 
 #ifdef __GNUG__
 #pragma interface "docview.h"

diff --git a/include/wx/dynlib.h b/include/wx/dynlib.h
index a1d3c794647a90632bb2dba706a8821aaae23956..428048ce145fa66c974318881abdef3064abff60 100644 (file)
--- a/include/wx/dynlib.h
+++ b/include/wx/dynlib.h
@@ -1,5 +1,5 @@
-#ifndef __DYNLIB_H__
-#define __DYNLIB_H__
+#ifndef _WX_DYNLIB_H__
+#define _WX_DYNLIB_H__

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface

diff --git a/include/wx/event.h b/include/wx/event.h
index e86f5afd25c01dd2bbbb64a340fe5ab11e0ed05e..418cfd5aae492758548c41eb85dbde3e0b011fdb 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __EVENTH__
-#define __EVENTH__
+#ifndef _WX_EVENTH__
+#define _WX_EVENTH__

 
 #ifdef __GNUG__
 #pragma interface "event.h"
 
 #ifdef __GNUG__
 #pragma interface "event.h"


@@ -395,6 +395,7 @@ class WXDLLEXPORT wxScrollEvent: public wxCommandEvent
  wxEVT_NC_RIGHT_DCLICK,
 */
 
  wxEVT_NC_RIGHT_DCLICK,
 */
 

+class WXDLLEXPORT wxDC;

 class WXDLLEXPORT wxMouseEvent: public wxEvent
 {
   DECLARE_DYNAMIC_CLASS(wxMouseEvent)
 class WXDLLEXPORT wxMouseEvent: public wxEvent
 {
   DECLARE_DYNAMIC_CLASS(wxMouseEvent)


@@ -1268,4 +1269,4 @@ const wxEventTableEntry theClass::sm_eventTableEntries[] = { \
  { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, NULL },\
 
 #endif
  { wxEVT_UPDATE_UI, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxUpdateUIEventFunction) & func, NULL },\
 
 #endif

-       // __EVENTH__
+       // _WX_EVENTH__

diff --git a/include/wx/expr.h b/include/wx/expr.h
index d19d8580b1724227577c3c9a76f943c5e5887ff7..418ed1b64b95700fe28b3b63d34cefd260e6f057 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __EXPRH__
-#define __EXPRH__
+#ifndef _WX_EXPRH__
+#define _WX_EXPRH__

 
 #include <math.h>
 #include <stdlib.h>
 
 #include <math.h>
 #include <stdlib.h>


@@ -126,4 +126,4 @@ void syntax_error();
 #endif
 
 #endif
 #endif
 
 #endif

-       // __EXPRH__
+       // _WX_EXPRH__

diff --git a/include/wx/file.h b/include/wx/file.h
index 656ae52585f8f29fe3d2fccc5a78db1ae63ea242..c422a034ef78dfc07beb284afa50908dd540e9a5 100644 (file)
--- a/include/wx/file.h
+++ b/include/wx/file.h
@@ -175,4 +175,4 @@ private:
 };
 
 #endif
 };
 
 #endif

-        // __FILEH__
+        // _WX_FILEH__

diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index 47ed6c70d41594faa620a0948f7f89a4966a45b9..cfb3737190eb7a84c3c10635fc257a1fcad64fb9 100644 (file)
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -1,15 +1,19 @@
-#ifndef __FILEDLGH_BASE__
-#define __FILEDLGH_BASE__
+#ifndef _WX_FILEDLG_H_BASE_
+#define _WX_FILEDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/filedlg.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/filedlg.h"
+#include "wx/motif/filedlg.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/filedlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/filedlg.h"
 #elif defined(__WXQT__)
 #include "wx/qt/filedlg.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/filedlg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/filedlg.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FILEDLGH_BASE__
+    // _WX_FILEDLG_H_BASE_

diff --git a/include/wx/filefn.h b/include/wx/filefn.h
index f46246add76729ef53429ea739ed288e9a8fc5e6..eb3eb478f601ba927411d56b6b1feb2342ab711a 100644 (file)
--- a/include/wx/filefn.h
+++ b/include/wx/filefn.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   __FILEFNH__
-#define   __FILEFNH__
+#ifndef   _FILEFN_H_
+#define   _FILEFN_H_

 
 #ifdef __GNUG__
 #pragma interface "filefn.h"
 
 #ifdef __GNUG__
 #pragma interface "filefn.h"


@@ -204,5 +204,5 @@ class WXDLLEXPORT wxPathList: public wxStringList
 };
 
 #endif
 };
 
 #endif

-  // __FILEFNH__
+  // _WX_FILEFN_H_

 
 

diff --git a/include/wx/font.h b/include/wx/font.h
index 84f67231a9d03a53aa71545ef4a9595c686b455d..165c9c9f06452984ab3b408b7ce5f11b0c7afce5 100644 (file)
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -1,15 +1,19 @@
-#ifndef __FONTH_BASE__
-#define __FONTH_BASE__
+#ifndef _WX_FONT_H_BASE_
+#define _WX_FONT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/font.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/font.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/font.h"
+#include "wx/motif/font.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/font.h"
 #elif defined(__WXQT__)
 #include "wx/qt/font.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/font.h"
 #elif defined(__WXQT__)
 #include "wx/qt/font.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/font.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/font.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FONTH_BASE__
+    // _WX_FONT_H_BASE_

diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 5aeb8cf6c965c409d05dee822412723952995d50..20445e884257d56314e21b1bea3c1caa04002f84 100644 (file)
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,5 +1,5 @@
-#ifndef __FONTDLGH_BASE__
-#define __FONTDLGH_BASE__
+#ifndef _WX_FONTDLG_H_BASE_
+#define _WX_FONTDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/fontdlg.h"


@@ -15,7 +15,15 @@
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #   define classwxFontDialog classwxGenericFontDialog
 #include "wx/generic/fontdlgg.h"
 #   define wxFontDialog wxGenericFontDialog
 #   define classwxFontDialog classwxGenericFontDialog

+#elif defined(__WXMAC__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog
+#elif defined(__WXSTUBS__)
+#include "wx/generic/fontdlgg.h"
+#   define wxFontDialog wxGenericFontDialog
+#   define classwxFontDialog classwxGenericFontDialog

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FONTDLGH_BASE__
+    // _WX_FONTDLG_H_BASE_

diff --git a/include/wx/frame.h b/include/wx/frame.h
index 2deb5f7d7fb2ae3230038c06e7d89ea1cc2564bc..329561fd9af050d8fb1758a15ea24817d7045c3a 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -1,15 +1,19 @@
-#ifndef __FRAMEH_BASE__
-#define __FRAMEH_BASE__
+#ifndef _WX_FRAME_H_BASE_
+#define _WX_FRAME_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/frame.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/frame.h"
+#include "wx/motif/frame.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
 #elif defined(__WXQT__)
 #include "wx/qt/frame.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/frame.h"
 #elif defined(__WXQT__)
 #include "wx/qt/frame.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/frame.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/frame.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __FRAMEH_BASE__
+    // _WX_FRAME_H_BASE_

diff --git a/include/wx/fstream.h b/include/wx/fstream.h
index 530961d387d9761cad15307f520aca2bc4e2081b..eab87dab2141f726176220ecf4882bd9e3efcea8 100644 (file)
--- a/include/wx/fstream.h
+++ b/include/wx/fstream.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXFSTREAM_H__
-#define __WXFSTREAM_H__
+#ifndef _WX_WXFSTREAM_H__
+#define _WX_WXFSTREAM_H__

 
 #include <wx/object.h>
 #include <wx/string.h>
 
 #include <wx/object.h>
 #include <wx/string.h>

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index eeaba1a2c63bf4e1368eee118b7e173d6bcb9803..abf8a1f7e0bfd87f4e0756e62d285c0a75e56e11 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -1,15 +1,19 @@
-#ifndef __GAUGEH_BASE__
-#define __GAUGEH_BASE__
+#ifndef _WX_GAUGE_H_BASE_
+#define _WX_GAUGE_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/gauge.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/gauge.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/gauge.h"
+#include "wx/motif/gauge.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/gauge.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gauge.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gauge.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gauge.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/gauge.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/gauge.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __GAUGEH_BASE__
+    // _WX_GAUGE_H_BASE_

diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 93320b4b3f1dc7db9f36632178d30e5ff5aa1a2b..17517cce8a39808b1ddc31358019d0af002b453a 100644 (file)
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GDICMNH__
-#define __GDICMNH__
+#ifndef _WX_GDICMNH__
+#define _WX_GDICMNH__

 
 #ifdef __GNUG__
 #pragma interface "gdicmn.h"
 
 #ifdef __GNUG__
 #pragma interface "gdicmn.h"


@@ -19,17 +19,9 @@
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/hash.h"

+#include "wx/string.h"

 #include "wx/setup.h"
 #include "wx/setup.h"

-
-#ifdef __WXMSW__
-#include "wx/msw/colour.h"
-#elif defined(__WXMOTIF__)
-#include "wx/xt/colour.h"
-#elif defined(__WXGTK__)
-#include "wx/gtk/colour.h"
-#elif defined(__WXQT__)
-#include "wx/qt/colour.h"
-#endif
+#include "wx/colour.h"

 
 // Standard cursors
 typedef enum {
 
 // Standard cursors
 typedef enum {


@@ -192,6 +184,8 @@ class WXDLLEXPORT wxPalette;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxIcon;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxIcon;

+class WXDLLEXPORT wxColour;
+class WXDLLEXPORT wxString;

 
 // Management of pens, brushes and fonts
 class WXDLLEXPORT wxPenList: public wxList
 
 // Management of pens, brushes and fonts
 class WXDLLEXPORT wxPenList: public wxList


@@ -359,4 +353,4 @@ class WXDLLEXPORT wxResourceCache: public wxList
 };
 
 #endif
 };
 
 #endif

-    // __GDICMNH__
+    // _WX_GDICMNH__

diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index d018a15bce7d180bc34590fd3649ad92dbfd834b..39762ec74957333cc0c66b384e4277c057372d1c 100644 (file)
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -1,15 +1,19 @@
-#ifndef __GDIOBJH_BASE__
-#define __GDIOBJH_BASE__
+#ifndef _WX_GDIOBJ_H_BASE_
+#define _WX_GDIOBJ_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/gdiobj.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/gdiobj.h"
+#include "wx/motif/gdiobj.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gdiobj.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/gdiobj.h"
 #elif defined(__WXQT__)
 #include "wx/qt/gdiobj.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/gdiobj.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/gdiobj.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __GDIOBJH_BASE__
+    // _WX_GDIOBJ_H_BASE_

diff --git a/include/wx/grid.h b/include/wx/grid.h
index 6d55e0889b62b09f96ac1187d8b6855f1dff55b9..668f69a3e30e99b72438fc76bc060a5bf96aa89a 100644 (file)
--- a/include/wx/grid.h
+++ b/include/wx/grid.h
@@ -1,5 +1,5 @@
-#ifndef __GRIDH_BASE__
-#define __GRIDH_BASE__
+#ifndef _WX_GRID_H_BASE_
+#define _WX_GRID_H_BASE_

 
 #include "wx/generic/gridg.h"
 
 
 #include "wx/generic/gridg.h"
 


@@ -8,4 +8,4 @@
 #endif
 
 #endif
 #endif
 
 #endif

-    // __GRIDH_BASE__
+    // _WX_GRID_H_BASE_

diff --git a/include/wx/hash.h b/include/wx/hash.h
index a1ae912a67c1e03facd1efa3d5b8d79bbc8ed483..e154046cf5e447a5b543124b699b2057ac6a084c 100644 (file)
--- a/include/wx/hash.h
+++ b/include/wx/hash.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXHASHH__
-#define __WXHASHH__
+#ifndef _WX_WXHASHH__
+#define _WX_WXHASHH__

 
 #ifdef __GNUG__
 #pragma interface "hash.h"
 
 #ifdef __GNUG__
 #pragma interface "hash.h"


@@ -95,4 +95,4 @@ class WXDLLEXPORT wxHashTable: public wxObject
 };
 
 #endif
 };
 
 #endif

-    // __WXHASHH__
+    // _WX_WXHASHH__

diff --git a/include/wx/help.h b/include/wx/help.h
index 0fe92b70fd6055bfc5c6e3bcd8ddebc986c9a763..71bff121f68ac8e829fbd77f5238ef8bdfb1ae93 100644 (file)
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,5 +1,5 @@
-#ifndef __HELPH_BASE__
-#define __HELPH_BASE__
+#ifndef _WX_HELP_H_BASE_
+#define _WX_HELP_H_BASE_

 
 #ifdef __WXMSW__
 #include "wx/msw/helpwin.h"
 
 #ifdef __WXMSW__
 #include "wx/msw/helpwin.h"


@@ -21,4 +21,4 @@
 #endif
 
 #endif
 #endif
 
 #endif

-    // __HELPH_BASE__
+    // _WX_HELP_H_BASE_

diff --git a/include/wx/helpbase.h b/include/wx/helpbase.h
index 1e7752f5c5e5b20267edf29ba098389b11320876..b1ee1c693b603d90813142f85c58d33027b2715c 100644 (file)
--- a/include/wx/helpbase.h
+++ b/include/wx/helpbase.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __HELPBASEH__
-#define __HELPBASEH__
+#ifndef _WX_HELPBASEH__
+#define _WX_HELPBASEH__

 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"
 
 #ifdef __GNUG__
 #pragma interface "helpbase.h"


@@ -48,4 +48,4 @@ class WXDLLEXPORT wxHelpControllerBase: public wxObject
 
 #endif // USE_HELP
 #endif
 
 #endif // USE_HELP
 #endif

-    // __HELPBASEH__
+    // _WX_HELPBASEH__

diff --git a/include/wx/helphtml.h b/include/wx/helphtml.h
index 345c71cac062a1ba48d312462eb62fa4dd0af716..20ce2789ab1d1878d8116a2d04d4abacb5079708 100644 (file)
--- a/include/wx/helphtml.h
+++ b/include/wx/helphtml.h
@@ -1,7 +1,7 @@
-#ifndef __HELPHTMLH_BASE__
-#define __HELPHTMLH_BASE__
+#ifndef _WX_HELPHTML_H_BASE_
+#define _WX_HELPHTML_H_BASE_

 
 #include "wx/generic/helphtml.h"
 
 #endif
 
 #include "wx/generic/helphtml.h"
 
 #endif

-    // __HELPHTMLH_BASE__
+    // _WX_HELPHTML_H_BASE_

diff --git a/include/wx/helpwin.h b/include/wx/helpwin.h
index b855c1fb99513ef23c8d72701780cff2c51ae068..5743288dadcfe9ea45a4542c6a06ac38a1b6d6f7 100644 (file)
--- a/include/wx/helpwin.h
+++ b/include/wx/helpwin.h
@@ -1,7 +1,7 @@
-#ifndef __HELPWINH_BASE__
-#define __HELPWINH_BASE__
+#ifndef _WX_HELPWIN_H_BASE_
+#define _WX_HELPWIN_H_BASE_

 
 #include "wx/msw/helpwin.h"
 
 #endif
 
 #include "wx/msw/helpwin.h"
 
 #endif

-    // __HELPWINH_BASE__
+    // _WX_HELPWIN_H_BASE_

diff --git a/include/wx/helpxlp.h b/include/wx/helpxlp.h
index 877d908823f15df20142a4d584d933b4f58afc75..b9f6af78ebb03872a012905d725c2159c8165e25 100644 (file)
--- a/include/wx/helpxlp.h
+++ b/include/wx/helpxlp.h
@@ -1,7 +1,7 @@
-#ifndef __HELPXLPH_BASE__
-#define __HELPXLPH_BASE__
+#ifndef _WX_HELPXLP_H_BASE_
+#define _WX_HELPXLP_H_BASE_

 
 #include "wx/generic/helpxlp.h"
 
 #endif
 
 #include "wx/generic/helpxlp.h"
 
 #endif

-    // __HELPXLPH_BASE__
+    // _WX_HELPXLP_H_BASE_

diff --git a/include/wx/icon.h b/include/wx/icon.h
index b5df2eff3811d5a19f36ebdeafb56674ca03dd06..2baded96c354999b57f7189a263b64314144d708 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,15 +1,19 @@
-#ifndef __ICONH_BASE__
-#define __ICONH_BASE__
+#ifndef _WX_ICON_H_BASE_
+#define _WX_ICON_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/icon.h"
+#include "wx/motif/icon.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/icon.h"
 #elif defined(__WXQT__)
 #include "wx/qt/icon.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/icon.h"
 #elif defined(__WXQT__)
 #include "wx/qt/icon.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/icon.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/icon.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __ICONH_BASE__
+    // _WX_ICON_H_BASE_

diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 69062ef67e563ff55b5cd1f0601f3b192ec8a193..e62b821a80117394ac251734d145396157a57b2c 100644 (file)
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,5 +1,5 @@
-#ifndef __IMAGLISTH_BASE__
-#define __IMAGLISTH_BASE__
+#ifndef _WX_IMAGLIST_H_BASE_
+#define _WX_IMAGLIST_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/imaglist.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/imaglist.h"


@@ -9,7 +9,11 @@
 #include "wx/generic/imaglist.h"
 #elif defined(__WXQT__)
 #include "wx/generic/imaglist.h"
 #include "wx/generic/imaglist.h"
 #elif defined(__WXQT__)
 #include "wx/generic/imaglist.h"

+#elif defined(__WXMAC__)
+#include "wx/generic/imaglist.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/imaglist.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __IMAGLISTH_BASE__
+    // _WX_IMAGLIST_H_BASE_

diff --git a/include/wx/intl.h b/include/wx/intl.h
index d60fd47f90b11367bcc6055efe770892d2b71c50..e6a597ed45bafa73f9c74a47bc17a8bc6500fa11 100644 (file)
--- a/include/wx/intl.h
+++ b/include/wx/intl.h
@@ -125,4 +125,4 @@ inline WXDLLEXPORT const char *wxGetTranslation(const char *sz)
 }
 
 #endif
 }
 
 #endif

-       // __INTLH__
+       // _WX_INTLH__

diff --git a/include/wx/ipcbase.h b/include/wx/ipcbase.h
index 44c594b45dcd5687f3d675249ee41bb00514dc38..d4cbe08f04f8aaf281a7c05c0350ce0cda48bc81 100644 (file)
--- a/include/wx/ipcbase.h
+++ b/include/wx/ipcbase.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __IPCBASEH__
-#define __IPCBASEH__
+#ifndef _WX_IPCBASEH__
+#define _WX_IPCBASEH__

 
 #ifdef __GNUG__
 #pragma interface "ipcbase.h"
 
 #ifdef __GNUG__
 #pragma interface "ipcbase.h"


@@ -94,4 +94,4 @@ class WXDLLEXPORT wxClientBase: public wxObject
 };
 
 #endif
 };
 
 #endif

-    // __IPCBASEH__
+    // _WX_IPCBASEH__

diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index b0ff1ef04dfc1f80b93bbfb3ef861c17df3f17d7..5391c9c5c349b222facf4f0b5897b34c62eb4d81 100644 (file)
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,12 +1,17 @@
-#ifndef __JOYSTICKH_BASE__
-#define __JOYSTICKH_BASE__
+#ifndef _WX_JOYSTICK_H_BASE_
+#define _WX_JOYSTICK_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/joystick.h"
 #elif defined(__WXMOTIF__)

+#include "wx/motif/joystick.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/joystick.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/joystick.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/joystick.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __JOYSTICKH_BASE__
+    // _WX_JOYSTICK_H_BASE_

diff --git a/include/wx/layout.h b/include/wx/layout.h
index 2f525bb1f05bb863a303058eef43f08fe918b2e1..a03b1d72c302fb4005d0302a25355f22b7ef8558 100644 (file)
--- a/include/wx/layout.h
+++ b/include/wx/layout.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __LAYOUTH__
-#define __LAYOUTH__
+#ifndef _WX_LAYOUTH__
+#define _WX_LAYOUTH__

 
 #ifdef __GNUG__
 #pragma interface "layout.h"
 
 #ifdef __GNUG__
 #pragma interface "layout.h"


@@ -306,4 +306,4 @@ class WXDLLEXPORT wxSpacingSizer: public wxSizer
 };
 
 #endif
 };
 
 #endif

-    // __LAYOUTH__
+    // _WX_LAYOUTH__

diff --git a/include/wx/list.h b/include/wx/list.h
index def8cc171345046edafa4d118e7966ee0565bd34..cbf6740b8ca10663720a91a155b2631f4232ab97 100644 (file)
--- a/include/wx/list.h
+++ b/include/wx/list.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __LISTH__
-#define __LISTH__
+#ifndef _WX_LISTH__
+#define _WX_LISTH__

 
 #ifdef __GNUG__
 #pragma interface "list.h"
 
 #ifdef __GNUG__
 #pragma interface "list.h"


@@ -140,4 +140,4 @@ class WXDLLEXPORT wxStringList: public wxList
 };
 
 #endif
 };
 
 #endif

-    // __LISTH__
+    // _WX_LISTH__

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 628ee836641e70017646bbaaa43d9fb3965435e5..9d8a3460dbf9bff57cd5ec4ad2fa2cad2ca1d480 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -1,15 +1,19 @@
-#ifndef __LISTBOXH_BASE__
-#define __LISTBOXH_BASE__
+#ifndef _WX_LISTBOX_H_BASE_
+#define _WX_LISTBOX_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/listbox.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/listbox.h"
+#include "wx/motif/listbox.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/listbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/listbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/listbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/listbox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/listbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/listbox.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __LISTBOXH_BASE__
+    // _WX_LISTBOX_H_BASE_

diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 51b65a8e5eb9384aa36039ff8ea95cd72840560c..d1fd4f90432e5b7788f824860fbf772d92789cd1 100644 (file)
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -1,5 +1,5 @@
-#ifndef __LISTCTRLH_BASE__
-#define __LISTCTRLH_BASE__
+#ifndef _WX_LISTCTRL_H_BASE_
+#define _WX_LISTCTRL_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/listctrl.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/listctrl.h"


@@ -9,7 +9,11 @@
 #include "wx/generic/listctrl.h"
 #elif defined(__WXQT__)
 #include "wx/generic/listctrl.h"
 #include "wx/generic/listctrl.h"
 #elif defined(__WXQT__)
 #include "wx/generic/listctrl.h"

+#elif defined(__WXMAC__)
+#include "wx/generic/listctrl.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/listctrl.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __LISTCTRLH_BASE__
+    // _WX_LISTCTRL_H_BASE_

diff --git a/include/wx/log.h b/include/wx/log.h
index 50918b2c021d9f566bbeb3e2828b5e1a57a7b601..85ec69896771bac5c12aad563cc0eabfa316b8f5 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   __LOGH__
-#define   __LOGH__
+#ifndef   _WX_LOG_H_
+#define   _WX_LOG_H_

 
 #ifdef    __GNUG__
 #pragma interface "log.h"
 
 #ifdef    __GNUG__
 #pragma interface "log.h"


@@ -159,6 +159,7 @@ private:
 };
 
 // log everything to an "ostream", cerr by default
 };
 
 // log everything to an "ostream", cerr by default

+class ostream;

 class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:
 class WXDLLEXPORT wxLogStream : public wxLog
 {
 public:


@@ -376,4 +377,4 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0);
   inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 
   inline void wxLogLastError(const char *) { }
 #endif  //debug/!debug
 

-#endif  //__LOGH__
+#endif  // _WX_LOG_H_

diff --git a/include/wx/matrix.h b/include/wx/matrix.h
index 8969893444ffad86874109ad215846310f358c2c..8204b66f3906b46b085982f65cdfce4b363a79ab 100644 (file)
--- a/include/wx/matrix.h
+++ b/include/wx/matrix.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MATRIXH__
-#define __MATRIXH__
+#ifndef _WX_MATRIXH__
+#define _WX_MATRIXH__

 
 #ifdef __GNUG__
 #pragma interface "matrix.h"
 
 #ifdef __GNUG__
 #pragma interface "matrix.h"


@@ -141,4 +141,4 @@ inline double wxCalculateDet(double a11, double a21, double a12, double a22)
 }
 
 #endif
 }
 
 #endif

-       // __MATRIXH__
+       // _WX_MATRIXH__

diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 1ecf988497fb34c022d1d9bcf9af8e4a4000c491..1ce5e5555c89bf6f43312503e6dab5a098901ceb 100644 (file)
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -1,15 +1,19 @@
-#ifndef __MDIH_BASE__
-#define __MDIH_BASE__
+#ifndef _WX_MDI_H_BASE_
+#define _WX_MDI_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/mdi.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/mdi.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/mdi.h"
+#include "wx/motif/mdi.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
 #elif defined(__WXQT__)
 #include "wx/qt/mdi.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/mdi.h"
 #elif defined(__WXQT__)
 #include "wx/qt/mdi.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/mdi.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/mdi.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __MDIH_BASE__
+    // _WX_MDI_H_BASE_

diff --git a/include/wx/memory.h b/include/wx/memory.h
index b0ab9a02df72507a52d2a000572280112aaf7fe0..9a17ad3ac99fc896b5be307f8ef0930b0eca221a 100644 (file)
--- a/include/wx/memory.h
+++ b/include/wx/memory.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MEMORYH__
-#define __MEMORYH__
+#ifndef _WX_MEMORYH__
+#define _WX_MEMORYH__

 
 #ifdef __GNUG__
 #pragma interface "memory.h"
 
 #ifdef __GNUG__
 #pragma interface "memory.h"


@@ -275,5 +275,5 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
 #endif // WXDEBUG
 
 #endif
 #endif // WXDEBUG
 
 #endif

-    // __MEMORYH__
+    // _WX_MEMORYH__

 
 

diff --git a/include/wx/menu.h b/include/wx/menu.h
index a448501bb8dd755aea3a23f7dfd14bb5d122d216..2d0ce9798b171b079f0c4659c48d48bc5850aac5 100644 (file)
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -1,15 +1,19 @@
-#ifndef __MENUH_BASE__
-#define __MENUH_BASE__
+#ifndef _WX_MENU_H_BASE_
+#define _WX_MENU_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/menu.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/menu.h"
+#include "wx/motif/menu.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
 #elif defined(__WXQT__)
 #include "wx/qt/menu.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/menu.h"
 #elif defined(__WXQT__)
 #include "wx/qt/menu.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/menu.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/menu.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __MENUH_BASE__
+    // _WX_MENU_H_BASE_

diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index d3eefe4240ea76cc5fbe96d29152b06ba64b6bc1..dab13f19f22c9d9a0d0041a24146a4d20f5ed63a 100644 (file)
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,9 +1,9 @@
-#ifndef __METAFILEH_BASE__
-#define __METAFILEH_BASE__
+#ifndef _WX_METAFILE_H_BASE_
+#define _WX_METAFILE_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/metafile.h"
 #endif
 
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/metafile.h"
 #endif
 
 #endif

-    // __METAFILEH_BASE__
+    // _WX_METAFILE_H_BASE_

diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 7a00d5d74df939261d393815ec76021e105ba1ae..3b45d33a526a65ae9834b74fce9d4a95a54b32bc 100644 (file)
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -1,13 +1,17 @@
-#ifndef __MINIFRAMH_BASE__
-#define __MINIFRAMH_BASE_
+#ifndef _WX_MINIFRAM_H_BASE_
+#define _WX_MINIFRAMH_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/minifram.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/minifram.h"
+#include "wx/motif/minifram.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/minifram.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/minifram.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/minifram.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/minifram.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __MINIFRAMH_BASE__
+    // _WX_MINIFRAM_H_BASE_

diff --git a/include/wx/module.h b/include/wx/module.h
index aaa9354269c1ad6d214709c836ddb5a08811ff57..c91f0e126a836353fccd481c02c4ac029370b5b9 100644 (file)
--- a/include/wx/module.h
+++ b/include/wx/module.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __MODULEH__
-#define __MODULEH__
+#ifndef _WX_MODULEH__
+#define _WX_MODULEH__

 
 #ifdef __GNUG__
 #pragma interface "module.h"
 
 #ifdef __GNUG__
 #pragma interface "module.h"

diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 3ac1c7f9f8eb2bf7bc4506b328a5202fb1e147fb..81aba4972cf545facca21cbd66bf74c34cd89e9b 100644 (file)
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,5 +1,5 @@
-#ifndef __MSGDLGH_BASE__
-#define __MSGDLGH_BASE__
+#ifndef _WX_MSGDLG_H_BASE_
+#define _WX_MSGDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/msgdlg.h"


@@ -9,7 +9,11 @@
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/msgdlgg.h"
 #include "wx/generic/msgdlgg.h"
 #elif defined(__WXQT__)
 #include "wx/generic/msgdlgg.h"

+#elif defined(__WXMAC__)
+#include "wx/generic/msgdlgg.h"
+#elif defined(__WXSTUBS__)
+#include "wx/generic/msgdlgg.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __MSGDLGH_BASE__
+    // _WX_MSGDLG_H_BASE_

diff --git a/include/wx/mstream.h b/include/wx/mstream.h
index 8c57cb0323a0d33f326fa7cd8ed001ee43b9625a..a07ce80cebf38307f973c1148f7d7a5c7d022145 100644 (file)
--- a/include/wx/mstream.h
+++ b/include/wx/mstream.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXMMSTREAM_H__
-#define __WXMMSTREAM_H__
+#ifndef _WX_WXMMSTREAM_H__
+#define _WX_WXMMSTREAM_H__

 
 #include <wx/stream.h>
 
 
 #include <wx/stream.h>
 

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index c7ca3e05ba02ab01213a25318e818bd986d78a7e..ab4d2b1c8728f04aff6e98a251b30d444de9e8cb 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -57,10 +57,10 @@ public:
     CrossHair(pt.x, pt.y);
   }
 
     CrossHair(pt.x, pt.y);
   }
 

-  virtual void DrawArc(long x1,long y1,long x2,long y2,double xc, double yc);
-  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, double xc, double yc)
+  virtual void DrawArc(long x1,long y1,long x2,long y2,long xc, long yc);
+  inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)

   {
   {

-    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, xc, yc);
+    DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);

   }
 
   virtual void DrawEllipticArc (long x, long y, long w, long h, double sa, double ea);
   }
 
   virtual void DrawEllipticArc (long x, long y, long w, long h, double sa, double ea);

diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 73b6f3921db0e818d6da9267b87e93e3b62de54b..4d2aaafc5c0c55b69e6a186d074bd8b00c49c798 100644 (file)
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -1,15 +1,19 @@
-#ifndef __NOTEBOOKH_BASE__
-#define __NOTEBOOKH_BASE__
+#ifndef _WX_NOTEBOOK_H_BASE_
+#define _WX_NOTEBOOK_H_BASE_

 
 #if defined(__WXMSW__)
   #include  "wx/msw/notebook.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
   #include  "wx/msw/notebook.h"
 #elif defined(__WXMOTIF__)

-  #error "wxNotebook not implemented under Motif"
+  #include  "wx/motif/notebook.h"

 #elif defined(__WXGTK__)
   #include  "wx/gtk/notebook.h"
 #elif defined(__WXQT__)
   #include  "wx/qt/notebook.h"
 #elif defined(__WXGTK__)
   #include  "wx/gtk/notebook.h"
 #elif defined(__WXQT__)
   #include  "wx/qt/notebook.h"

+#elif defined(__WXMAC__)
+  #include  "wx/mac/notebook.h"
+#elif defined(__WXSTUBS__)
+  #include  "wx/stubs/notebook.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __NOTEBOOKH_BASE__
+    // _WX_NOTEBOOK_H_BASE_

diff --git a/include/wx/object.h b/include/wx/object.h
index d4752864bebd3d81f6888c5e8d07724006f5f072..f2c06af43b7b683c2f8b3b512b5f73099e36b10f 100644 (file)
--- a/include/wx/object.h
+++ b/include/wx/object.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __OBJECTH__
-#define __OBJECTH__
+#ifndef _WX_OBJECTH__
+#define _WX_OBJECTH__

 
 #ifdef __GNUG__
 #pragma interface "object.h"
 
 #ifdef __GNUG__
 #pragma interface "object.h"


@@ -221,6 +221,6 @@ private:
 #endif
 
 #endif
 #endif
 
 #endif

-    // __OBJECTH__
+    // _WX_OBJECTH__

 
 
 
 

diff --git a/include/wx/objstrm.h b/include/wx/objstrm.h
index f7e7f58d6f017cc4a61472852cc616361fe38ac5..fbe79e4503378bd5efaf4d71f6ab3ea3db3b61a2 100644 (file)
--- a/include/wx/objstrm.h
+++ b/include/wx/objstrm.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXOBJSTRM_H__
-#define __WXOBJSTRM_H__
+#ifndef _WX_WXOBJSTRM_H__
+#define _WX_WXOBJSTRM_H__

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface

diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 58d027a0839f890551ef3f416bca88c1b4208360..5a3b3899a4c6d167c7f9b6578060c5d57398c497 100644 (file)
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -17,8 +17,8 @@
 #pragma interface "odbc.h"
 #endif
 
 #pragma interface "odbc.h"
 #endif
 

-#ifndef __ODBCH__
-#define __ODBCH__
+#ifndef _WX_ODBCH__
+#define _WX_ODBCH__

 
 #ifdef __WXMSW__
 #include <windows.h>
 
 #ifdef __WXMSW__
 #include <windows.h>

diff --git a/include/wx/palette.h b/include/wx/palette.h
index 04339568b5899e4509a43c27204fd003ca6a7258..9702d374a18c87c3c3121a26687dc990af4711a3 100644 (file)
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,15 +1,19 @@
-#ifndef __PALETTEH_BASE__
-#define __PALETTEH_BASE__
+#ifndef _WX_PALETTE_H_BASE_
+#define _WX_PALETTE_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/palette.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/palette.h"
+#include "wx/motif/palette.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/palette.h"
 #elif defined(__WXQT__)
 #include "wx/qt/palette.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/palette.h"
 #elif defined(__WXQT__)
 #include "wx/qt/palette.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/palette.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/palette.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PALETTEH_BASE__
+    // _WX_PALETTE_H_BASE_

diff --git a/include/wx/panel.h b/include/wx/panel.h
index 8944fee1c5803e8ecdadf2c587458a3b3be2322a..0bfa7daaca81d7b8f9ae60e2ca7c1f546fd5fcfd 100644 (file)
--- a/include/wx/panel.h
+++ b/include/wx/panel.h
@@ -1,7 +1,7 @@
-#ifndef __PANELH_BASE__
-#define __PANELH_BASE__
+#ifndef _WX_PANEL_H_BASE_
+#define _WX_PANEL_H_BASE_

 
 #include "wx/generic/panelg.h"
 
 #endif
 
 #include "wx/generic/panelg.h"
 
 #endif

-    // __PANELH_BASE_
+    // _WX_PANELH_BASE_

diff --git a/include/wx/pen.h b/include/wx/pen.h
index 97da9143a8f8d548d1e0c39a85574d7d4bb94e11..d132d8a7c973c70a51f2ccae351a6eca795f3ec6 100644 (file)
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -1,15 +1,19 @@
-#ifndef __PENH_BASE__
-#define __PENH_BASE__
+#ifndef _WX_PEN_H_BASE_
+#define _WX_PEN_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/pen.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/pen.h"
+#include "wx/motif/pen.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/pen.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pen.h"
 #elif defined(__WXQT__)
 #include "wx/qt/pen.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/pen.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/pen.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PENH_BASE__
+    // _WX_PEN_H_BASE_

diff --git a/include/wx/pnghand.h b/include/wx/pnghand.h
index a7b71c7693fe43b7a6080dd7b5def98a1b9a6d16..405e234ba5c73c4e4a390bdae678c6b7ecb9deae 100644 (file)
--- a/include/wx/pnghand.h
+++ b/include/wx/pnghand.h
@@ -1,13 +1,17 @@
-#ifndef __PNGHANDH_BASE__
-#define __PNGHANDH_BASE__
+#ifndef _WX_PNGHAND_H_BASE_
+#define _WX_PNGHAND_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/pnghand.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/pnghand.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/pnghand.h"
+#include "wx/motif/pnghand.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/pnghand.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/pnghand.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/pnghand.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/pnghand.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PNGHANDH_BASE__
+    // _WX_PNGHAND_H_BASE_

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index f9536aa0e80a858836e3cfc79a38f95b81ab3320..e1b12928a37c339d3e2f3d02e1ec27fec0d4e40b 100644 (file)
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __POSTSCRPH__
-#define __POSTSCRPH__
+#ifndef _WX_POSTSCRPH__
+#define _WX_POSTSCRPH__

 
 #ifdef __GNUG__
 #pragma interface "postscrp.h"
 
 #ifdef __GNUG__
 #pragma interface "postscrp.h"


@@ -295,4 +295,4 @@ WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
 #endif // USE_POSTSCRIPT
 #endif
 
 #endif // USE_POSTSCRIPT
 #endif

-        // __POSTSCRPH__
+        // _WX_POSTSCRPH__

diff --git a/include/wx/print.h b/include/wx/print.h
index e0d05230f4e1903a3fed9c18f49c51688e3725a2..4d63fb0e567b35f598922ae974d1e0ffcff0d014 100644 (file)
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -1,5 +1,5 @@
-#ifndef __PRINTH_BASE__
-#define __PRINTH_BASE__
+#ifndef _WX_PRINT_H_BASE_
+#define _WX_PRINT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/printwin.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/printwin.h"


@@ -25,4 +25,4 @@
 
 
 #endif
 
 
 #endif

-    // __PRINTH_BASE__
+    // _WX_PRINT_H_BASE_

diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index bd0e58ccd09b5024cefdfce0ee6ed31edea38da1..a1455213a13e323d23f2dcb0b53e02e0c7e8b49d 100644 (file)
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,5 +1,5 @@
-#ifndef __PRINTDLGH_BASE__
-#define __PRINTDLGH_BASE__
+#ifndef _WX_PRINTDLG_H_BASE_
+#define _WX_PRINTDLG_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/printdlg.h"
 
 #if defined(__WXMSW__)
 #include "wx/msw/printdlg.h"


@@ -7,7 +7,13 @@
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"
 #include "wx/generic/prntdlgg.h"
 #elif defined(__WXGTK__)
 #include "wx/generic/prntdlgg.h"

+#elif defined(__WXQT__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/prntdlgg.h"
+#elif defined(__WXSRUBS__)
+#include "wx/generic/prntdlgg.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __PRINTDLGH_BASE__
+    // _WX_PRINTDLG_H_BASE_

diff --git a/include/wx/prntbase.h b/include/wx/prntbase.h
index b1b455853ae6fcc03bbd106e6f8a9d7f0c02dbb7..be72e1d0f23afbe0cc43a3fea76cd0691cda4db5 100644 (file)
--- a/include/wx/prntbase.h
+++ b/include/wx/prntbase.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PRNTBASEH__
-#define __PRNTBASEH__
+#ifndef _WX_PRNTBASEH__
+#define _WX_PRNTBASEH__

 
 #ifdef __GNUG__
 #pragma interface "prntbase.h"
 
 #ifdef __GNUG__
 #pragma interface "prntbase.h"


@@ -22,6 +22,7 @@
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"
 #include "wx/panel.h"
 #include "wx/scrolwin.h"
 #include "wx/dialog.h"

+#include "wx/frame.h"

 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxButton;
 
 class WXDLLEXPORT wxDC;
 class WXDLLEXPORT wxButton;


@@ -332,4 +333,4 @@ public:
 };
 
 #endif
 };
 
 #endif

-    // __PRNTBASEH__
+    // _WX_PRNTBASEH__

diff --git a/include/wx/process.h b/include/wx/process.h
index 96ce4e5fb95f45e4b80485500c47058b663a9998..67677f35d8c2948fa966094395a1baa41d58a32e 100644 (file)
--- a/include/wx/process.h
+++ b/include/wx/process.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __PROCESSH__
-#define __PROCESSH__
+#ifndef _WX_PROCESSH__
+#define _WX_PROCESSH__

 
 #ifdef __GNUG__
 #pragma interface "process.h"
 
 #ifdef __GNUG__
 #pragma interface "process.h"


@@ -55,4 +55,4 @@ typedef void (wxObject::*wxProcessEventFunction)(wxProcessEvent&);
 #define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL},
 
 #endif
 #define EVT_END_PROCESS(id, func) { wxEVT_END_TERMINATE, id, -1, (wxObjectEvent) (wxEventFunction) (wxProcessEventFunction) & fn, NULL},
 
 #endif

-    // __PROCESSH__
+    // _WX_PROCESSH__

diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index a84da1da4d367d0b03a81ea70730c0d4092b8035..2f0253ddb92a0cf59992ca8080f32798da5529d0 100644 (file)
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -1,15 +1,19 @@
-#ifndef __RADIOBOXH_BASE__
-#define __RADIOBOXH_BASE__
+#ifndef _WX_RADIOBOX_H_BASE_
+#define _WX_RADIOBOX_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobox.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/radiobox.h"
+#include "wx/motif/radiobox.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/radiobox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/radiobox.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __RADIOBOXH_BASE__
+    // _WX_RADIOBOX_H_BASE_

diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 7d6708b27e72e5aea2dcda5bf9c34ce22a35ea51..ce602dcc0f408fe14ffb962f8be0ce85e9c40c1d 100644 (file)
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -1,15 +1,19 @@
-#ifndef __RADIOBUTH_BASE__
-#define __RADIOBUTH_BASE__
+#ifndef _WX_RADIOBUT_H_BASE_
+#define _WX_RADIOBUT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/radiobut.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/radiobut.h"
+#include "wx/motif/radiobut.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobut.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobut.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/radiobut.h"
 #elif defined(__WXQT__)
 #include "wx/qt/radiobut.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/radiobut.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/radiobut.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __RADIOBUTH_BASE__
+    // _WX_RADIOBUT_H_BASE_

diff --git a/include/wx/region.h b/include/wx/region.h
index c076b5a5c26b30abecbb8fd7f44227addd252858..9c5afd22bc8f97ddaeaef20ba59350088d085b50 100644 (file)
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,15 +1,19 @@
-#ifndef __REGIONH_BASE__
-#define __REGIONH_BASE__
+#ifndef _WX_REGION_H_BASE_
+#define _WX_REGION_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/region.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/region.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/region.h"
+#include "wx/motif/region.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/region.h"
 #elif defined(__WXQT__)
 #include "wx/qt/region.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/region.h"
 #elif defined(__WXQT__)
 #include "wx/qt/region.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/region.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/region.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __REGIONH_BASE__
+    // _WX_REGION_H_BASE_

diff --git a/include/wx/resource.h b/include/wx/resource.h
index e01582b2a151ef846f78b9fb00fdd295592a0116..316b9c3b718222759b01277cf645ae75ee187d67 100644 (file)
--- a/include/wx/resource.h
+++ b/include/wx/resource.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __RESOURCEH__
-#define __RESOURCEH__
+#ifndef _WX_RESOURCEH__
+#define _WX_RESOURCEH__

 
 #ifdef __GNUG__
 #pragma interface "resource.h"
 
 #ifdef __GNUG__
 #pragma interface "resource.h"


@@ -171,4 +171,4 @@ extern int WXDLLEXPORT wxResourceGetIdentifier(char *name, wxResourceTable *tabl
 
 #endif
 #endif
 
 #endif
 #endif

-    // __RESOURCEH__
+    // _WX_RESOURCEH__

diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 3325b9b4eee1907fdca05a3683f904781e785184..49f9a11b05cc997e82be386d76b745fa3e47ef15 100644 (file)
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,15 +1,19 @@
-#ifndef __SCROLBARH_BASE__
-#define __SCROLBARH_BASE__
+#ifndef _WX_SCROLBAR_H_BASE_
+#define _WX_SCROLBAR_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/scrolbar.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/scrolbar.h"
+#include "wx/motif/scrolbar.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/scrolbar.h"
 #elif defined(__WXQT__)
 #include "wx/qt/scrolbar.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/scrolbar.h"
 #elif defined(__WXQT__)
 #include "wx/qt/scrolbar.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/scrolbar.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/scrolbar.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __SCROLBARH_BASE__
+    // _WX_SCROLBAR_H_BASE_

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index 2f98b0274b2e30aed906c7a176bbd2a16cb3c992..44298184bbe853c6cf678e38de4f4b0564d5d09d 100644 (file)
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -1,7 +1,7 @@
-#ifndef __SCROLWINH_BASE__
-#define __SCROLWINH_BASE__
+#ifndef _WX_SCROLWIN_H_BASE_
+#define _WX_SCROLWIN_H_BASE_

 
 #include "wx/generic/scrolwin.h"
 
 #endif
 
 #include "wx/generic/scrolwin.h"
 
 #endif

-    // __SCROLWINH_BASE__
+    // _WX_SCROLWIN_H_BASE_

diff --git a/include/wx/serbase.h b/include/wx/serbase.h
index c49b61d7ced9aa5ef31da678a0df27e4b7ff5a88..f4c3be113e0685589977cf503d19f8f3fe1b18cc 100644 (file)
--- a/include/wx/serbase.h
+++ b/include/wx/serbase.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WX_SERBASEH_H__
-#define __WX_SERBASEH_H__
+#ifndef _WX_WX_SERBASEH_H__
+#define _WX_WX_SERBASEH_H__

 
 #include <wx/dynlib.h>
 
 
 #include <wx/dynlib.h>
 

diff --git a/include/wx/settings.h b/include/wx/settings.h
index a81d15fc7d0b17e728f130d54e8902aa9fde0d90..1dfc5d9280c8ddb53a4cf04175b3a4a55446d5b2 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __SETTINGSH_BASE__
-#define __SETTINGSH_BASE__
+#ifndef _WX_SETTINGS_H_BASE_
+#define _WX_SETTINGS_H_BASE_

 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1
 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1


@@ -107,13 +107,17 @@
 #if defined(__WXMSW__)
 #include "wx/msw/settings.h"
 #elif defined(__WXMOTIF__)
 #if defined(__WXMSW__)
 #include "wx/msw/settings.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/settings.h"
+#include "wx/motif/settings.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"
 #elif defined(__WXQT__)
 #include "wx/qt/settings.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/settings.h"
 #elif defined(__WXQT__)
 #include "wx/qt/settings.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/settings.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/settings.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __SETTINGSH_BASE__
+    // _WX_SETTINGS_H_BASE_

 
 

diff --git a/include/wx/setup.h b/include/wx/setup.h
index 3b604344259b7c66d1b581e60ece79c6d722c341..bd1963b9ec2b81de0cd0a8f5f7092827702efee3 100644 (file)
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -1,22 +1,26 @@
 
 

-#ifndef __SETUPH_BASE__
-#define __SETUPH_BASE__
+#ifndef _WX_SETUP_H_BASE_
+#define _WX_SETUP_H_BASE_

 
 // compatibility code, to be removed asap:
 
 
 // compatibility code, to be removed asap:
 

-#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__)
-#  if defined(__WINDOWS__)
-#    define __WXMSW__
-#  else
-#    error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
-#  endif
+#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__)
+#    error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__

 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/setup.h"
 #endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/setup.h"

-#else
+#elif defined(__WXMAC__)
+#include "wx/mac/setup.h"
+#elif defined(__WXQT__)
+#include "wx/qt/setup.h"
+#elif defined(__WXMOTIF__)
+#include "wx/motif/setup.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/setup.h"
+#elif defined(__WXGTK__)

 #include "wx/../../install/unix/setup/setup.h"
 #endif
 
 #endif
 #include "wx/../../install/unix/setup/setup.h"
 #endif
 
 #endif

-       // __SETUPH_BASE__
+       // _WX_SETUP_H_BASE_

diff --git a/include/wx/slider.h b/include/wx/slider.h
index 21ad69c143042b248bccd840fa574ad8d93643b4..739a311aa5aa527d0617a7548905f2253860301a 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -1,15 +1,19 @@
-#ifndef __SLIDERH_BASE__
-#define __SLIDERH_BASE__
+#ifndef _WX_SLIDER_H_BASE_
+#define _WX_SLIDER_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/slider.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/slider.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/slider.h"
+#include "wx/motif/slider.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/slider.h"
 #elif defined(__WXQT__)
 #include "wx/qt/slider.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/slider.h"
 #elif defined(__WXQT__)
 #include "wx/qt/slider.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/slider.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/slider.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __SLIDERH_BASE__
+    // _WX_SLIDER_H_BASE_

diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index c961ea2c6324cfa5eb06b0d95ee8e1636166a5a2..7d1c5c38067fdc7a30053b9dc476f650a4ad2d17 100644 (file)
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -1,15 +1,19 @@
-#ifndef __SPINBUTTH_BASE__
-#define __SPINBUTTH_BASE__
+#ifndef _WX_SPINBUTT_H_BASE_
+#define _WX_SPINBUTT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/spinbutt.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/spinbutt.h"
+#include "wx/motif/spinbutt.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/spinbutt.h"
 #elif defined(__WXQT__)
 #include "wx/qt/spinbutt.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/spinbutt.h"
 #elif defined(__WXQT__)
 #include "wx/qt/spinbutt.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/spinbutt.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/spinbutt.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __SPINBUTTH_BASE__
+    // _WX_SPINBUTT_H_BASE_

diff --git a/include/wx/splitter.h b/include/wx/splitter.h
index 626852e49faca7553dd0aef593f4eb5477fc8b51..0a5232403b37daa9ce29338c8b14f6d646af946c 100644 (file)
--- a/include/wx/splitter.h
+++ b/include/wx/splitter.h
@@ -1,7 +1,7 @@
-#ifndef __SPLITTERH_BASE__
-#define __SPLITTERH_BASE__
+#ifndef _WX_SPLITTER_H_BASE_
+#define _WX_SPLITTER_H_BASE_

 
 #include "wx/generic/splitter.h"
 
 #endif
 
 #include "wx/generic/splitter.h"
 
 #endif

-    // __SPLITTERH_BASE__
+    // _WX_SPLITTER_H_BASE_

diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 32c1534f90d38a35c52d7e87f49d53c825755255..0f32d687a359a9b252303a7558a955899be77f56 100644 (file)
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -1,15 +1,19 @@
-#ifndef __STATBMPH_BASE__
-#define __STATBMPH_BASE__
+#ifndef _WX_STATBMP_H_BASE_
+#define _WX_STATBMP_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/statbmp.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/statbmp.h"
+#include "wx/motif/statbmp.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/statbmp.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbmp.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbmp.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbmp.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/statbmp.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/statbmp.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __STATBMPH_BASE__
+    // _WX_STATBMP_H_BASE_

diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index 9bd9006136021973cc8a18e36880036e39b3e454..f1a8bd6eea3296a301004082acb8d884adf6bf5d 100644 (file)
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,15 +1,19 @@
-#ifndef __STATBOXH_BASE__
-#define __STATBOXH_BASE__
+#ifndef _WX_STATBOX_H_BASE_
+#define _WX_STATBOX_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/statbox.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/statbox.h"
+#include "wx/motif/statbox.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbox.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/statbox.h"
 #elif defined(__WXQT__)
 #include "wx/qt/statbox.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/statbox.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/statbox.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __STATBOXH_BASE__
+    // _WX_STATBOX_H_BASE_

diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0346783aaf7aac73bbc1743f7a637c91053da4c2..abfbbd5be6a582ca72bbb9dea437e027d252a202 100644 (file)
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,15 +1,19 @@
-#ifndef __STATTEXTH_BASE__
-#define __STATTEXTH_BASE_
+#ifndef _WX_STATTEXT_H_BASE_
+#define _WX_STATTEXT_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/stattext.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/stattext.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/stattext.h"
+#include "wx/motif/stattext.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/stattext.h"
 #elif defined(__WXQT__)
 #include "wx/qt/stattext.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/stattext.h"
 #elif defined(__WXQT__)
 #include "wx/qt/stattext.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/stattext.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/stattext.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __STATTEXTH_BASE__
+    // _WX_STATTEXT_H_BASE_

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 1775a2594a7f8f86ef52c26ce3b2eebf74df6c88..327238fbd24bdff582a252cce75d74c3ff540345 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -1,7 +1,7 @@
-#ifndef __STATUSBRH_BASE__
-#define __STATUSBRH_BASE__
+#ifndef _WX_STATUSBR_H_BASE_
+#define _WX_STATUSBR_H_BASE_

 
 #include "wx/generic/statusbr.h"
 
 #endif
 
 #include "wx/generic/statusbr.h"
 
 #endif

-    // __STATUSBRH_BASE__
+    // _WX_STATUSBR_H_BASE_

diff --git a/include/wx/stream.h b/include/wx/stream.h
index a2f1c0f89bfd6c80356958057daa9ed11eea8123..d966c7da37d4f45f8a9341eae95d3735e0e647a1 100644 (file)
--- a/include/wx/stream.h
+++ b/include/wx/stream.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXSTREAM_H__
-#define __WXSTREAM_H__
+#ifndef _WX_WXSTREAM_H__
+#define _WX_WXSTREAM_H__

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface

diff --git a/include/wx/string.h b/include/wx/string.h
index 3c7a1cdf09a8a72282098eeaa97576d5a10466f3..a4442365f3413564c7a6dd92e7adf37230735d15 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXSTRINGH__
-#define __WXSTRINGH__
+#ifndef _WX_WXSTRINGH__
+#define _WX_WXSTRINGH__

 
 #ifdef __GNUG__
 #pragma interface "string.h"
 
 #ifdef __GNUG__
 #pragma interface "string.h"


@@ -925,6 +925,6 @@ istream& WXDLLEXPORT operator>>(istream& is, wxString& str);
 
 #endif  //std::string compatibility
 
 
 #endif  //std::string compatibility
 

-#endif  // __WXSTRINGH__
+#endif  // _WX_WXSTRINGH__

 
 //@}
 
 //@}

diff --git a/include/wx/stubs/accel.h b/include/wx/stubs/accel.h
index 27ed68439e2193d5528d80c2bb757f9d616283c6..236dc0eb55236e436bacf3132f26b25f9b1103c2 100644 (file)
--- a/include/wx/stubs/accel.h
+++ b/include/wx/stubs/accel.h
@@ -17,6 +17,7 @@
 #endif
 
 #include "wx/object.h"
 #endif
 
 #include "wx/object.h"

+#include "wx/string.h"

 
 class WXDLLEXPORT wxAcceleratorTable;
 
 
 class WXDLLEXPORT wxAcceleratorTable;
 

diff --git a/include/wx/stubs/app.h b/include/wx/stubs/app.h
index cb50ba9c9e5318745cbcf0a72ff4df8bcf259ea4..3b1467fec58a94bf6275647b6dbd1b158f644ebd 100644 (file)
--- a/include/wx/stubs/app.h
+++ b/include/wx/stubs/app.h
@@ -18,6 +18,8 @@
 
 #include "wx/defs.h"
 #include "wx/object.h"
 
 #include "wx/defs.h"
 #include "wx/object.h"

+#include "wx/gdicmn.h"
+#include "wx/event.h"

 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxWindow;

diff --git a/include/wx/stubs/checklst.h b/include/wx/stubs/checklst.h
index b0fc0a2978c761666bb49ac28fad1dfaee3aa32f..5cc193d98af8baa3e47d0abb698940ed1b0d7f57 100644 (file)
--- a/include/wx/stubs/checklst.h
+++ b/include/wx/stubs/checklst.h
@@ -17,6 +17,8 @@
 #pragma interface "checklst.h"
 #endif
 
 #pragma interface "checklst.h"
 #endif
 

+#include "wx/listbox.h"
+

 typedef   unsigned int  uint;
 
 class wxCheckListBox : public wxListBox
 typedef   unsigned int  uint;
 
 class wxCheckListBox : public wxListBox


@@ -38,9 +40,6 @@ public:
   bool  IsChecked(uint uiIndex) const;
   void  Check(uint uiIndex, bool bCheck = TRUE);
 
   bool  IsChecked(uint uiIndex) const;
   void  Check(uint uiIndex, bool bCheck = TRUE);
 

-  // accessors
-  uint  GetItemHeight() const { return m_nItemHeight; }
-

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };
 

diff --git a/include/wx/stubs/colour.h b/include/wx/stubs/colour.h
index e8fca8e3b413d11cf03faae06f87a69619641953..452d946cdca9377a672c963a33daac7933761abe 100644 (file)
--- a/include/wx/stubs/colour.h
+++ b/include/wx/stubs/colour.h
@@ -16,6 +16,9 @@
 #pragma interface "colour.h"
 #endif
 
 #pragma interface "colour.h"
 #endif
 

+#include "wx/object.h"
+#include "wx/string.h"
+

 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 {
 // Colour
 class WXDLLEXPORT wxColour: public wxObject
 {


@@ -49,7 +52,9 @@ public:
 
   inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 
 
   inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
 

+/* TODO

   WXCOLORREF GetPixel() const { return m_pixel; };
   WXCOLORREF GetPixel() const { return m_pixel; };

+*/

 
  private:
   bool                         m_isInit;
 
  private:
   bool                         m_isInit;

diff --git a/include/wx/stubs/cursor.h b/include/wx/stubs/cursor.h
index 9cf490cdc6004b08880ba11c37990bcd98c8b6fa..027745838a74a45627d042a6a3f79742630fe957 100644 (file)
--- a/include/wx/stubs/cursor.h
+++ b/include/wx/stubs/cursor.h
@@ -57,7 +57,8 @@ public:
   wxCursor(int cursor_type);
   ~wxCursor();
 
   wxCursor(int cursor_type);
   ~wxCursor();
 

-  virtual bool Ok() const { return (m_refData != NULL && M_CURSORDATA->m_hCursor) ; }
+  // TODO: also verify the internal cursor handle
+  virtual bool Ok() const { return (m_refData != NULL) ; }

 
   inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
   inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }
 
   inline wxCursor& operator = (const wxCursor& cursor) { if (*this == cursor) return (*this); Ref(cursor); return *this; }
   inline bool operator == (const wxCursor& cursor) { return m_refData == cursor.m_refData; }

diff --git a/include/wx/stubs/dc.h b/include/wx/stubs/dc.h
index eb10154ab9aae728161ac278a7bdeabffa75c8ed..f2c2ca6c4de47da3c84fe8c5b96aad803462a4ff 100644 (file)
--- a/include/wx/stubs/dc.h
+++ b/include/wx/stubs/dc.h
@@ -26,6 +26,7 @@
 // constants
 //-----------------------------------------------------------------------------
 
 // constants
 //-----------------------------------------------------------------------------
 

+#ifndef MM_TEXT

 #define MM_TEXT                        0
 #define MM_ISOTROPIC   1
 #define MM_ANISOTROPIC 2
 #define MM_TEXT                        0
 #define MM_ISOTROPIC   1
 #define MM_ANISOTROPIC 2


@@ -34,6 +35,7 @@
 #define MM_TWIPS               5
 #define MM_POINTS              6
 #define MM_METRIC              7
 #define MM_TWIPS               5
 #define MM_POINTS              6
 #define MM_METRIC              7

+#endif

 
 //-----------------------------------------------------------------------------
 // global variables
 
 //-----------------------------------------------------------------------------
 // global variables


@@ -59,11 +61,12 @@ class WXDLLEXPORT wxDC: public wxObject
     
     virtual bool Ok(void) const { return m_ok; };
 
     
     virtual bool Ok(void) const { return m_ok; };
 

-    virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE ) = 0;
+    virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE ) = 0;

     inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
     {
     inline void FloodFill(const wxPoint& pt, const wxColour& col, int style=wxFLOOD_SURFACE)
     {

-        FloodFill(pt.x, pt.y, col, style);
+        FloodFill(pt.x, pt.y, (wxColour*) & col, style);

     }
     }

+

     virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0;
     inline bool GetPixel(const wxPoint& pt, wxColour *col) const
     {
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const = 0;
     inline bool GetPixel(const wxPoint& pt, wxColour *col) const
     {


@@ -82,10 +85,10 @@ class WXDLLEXPORT wxDC: public wxObject
         CrossHair(pt.x, pt.y);
     }
 
         CrossHair(pt.x, pt.y);
     }
 

-    virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc ) = 0;
-    inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, double xc, double yc)
+    virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc ) = 0;
+    inline void DrawArc(const wxPoint& pt1, const wxPoint& pt2, const wxPoint& centre)

     {
     {

-        DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, xc, yc);
+        DrawArc(pt1.x, pt1.y, pt2.x, pt2.y, centre.x, centre.y);

     }
 
     virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) = 0;
     }
 
     virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea ) = 0;


@@ -133,8 +136,6 @@ class WXDLLEXPORT wxDC: public wxObject
         DrawEllipse(rect.x, rect.y, rect.width, rect.height);
     }
 
         DrawEllipse(rect.x, rect.y, rect.width, rect.height);
     }
 

-    virtual void DrawIcon(const wxIcon& icon, long x, long y) = 0;
-

     virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
     virtual void DrawSpline( wxList *points );
     virtual void DrawSpline( int n, wxPoint points[] );
     virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
     virtual void DrawSpline( wxList *points );
     virtual void DrawSpline( int n, wxPoint points[] );


@@ -176,16 +177,16 @@ class WXDLLEXPORT wxDC: public wxObject
     virtual void Clear(void) = 0;
             
     virtual void SetFont( const wxFont &font ) = 0;
     virtual void Clear(void) = 0;
             
     virtual void SetFont( const wxFont &font ) = 0;

-    virtual wxFont *GetFont(void) const { return &m_font; };
+    virtual wxFont *GetFont(void) const { return (wxFont*) &m_font; };

     
     virtual void SetPen( const wxPen &pen ) = 0;
     
     virtual void SetPen( const wxPen &pen ) = 0;

-    virtual wxPen *GetPen(void) const { return &m_pen; };
+    virtual wxPen *GetPen(void) const { return (wxPen*) &m_pen; };

     
     virtual void SetBrush( const wxBrush &brush ) = 0;
     
     virtual void SetBrush( const wxBrush &brush ) = 0;

-    virtual wxBrush *GetBrush(void) const { return &m_brush; };
+    virtual wxBrush *GetBrush(void) const { return (wxBrush*) &m_brush; };

 
     virtual void SetBackground( const wxBrush &brush ) = 0;
 
     virtual void SetBackground( const wxBrush &brush ) = 0;

-    virtual wxBrush *GetBackground(void) const { return &m_backgroundBrush; };
+    virtual wxBrush *GetBackground(void) const { return (wxBrush*) &m_backgroundBrush; };

 
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) const { return m_logicalFunction; };
 
     virtual void SetLogicalFunction( int function ) = 0;
     virtual int GetLogicalFunction(void) const { return m_logicalFunction; };

diff --git a/include/wx/stubs/dcclient.h b/include/wx/stubs/dcclient.h
index 828a507d75cf30b59ba7e3163d87924efbbfbaa0..ce81dec72c586e15bd1412198b41d238547863c1 100644 (file)
--- a/include/wx/stubs/dcclient.h
+++ b/include/wx/stubs/dcclient.h
@@ -23,6 +23,7 @@
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxPaintDC;
 //-----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxPaintDC;

+class WXDLLEXPORT wxWindow;

 
 // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently.
 // On many platforms, however, they will be the same.
 
 // Under Windows, wxClientDC, wxPaintDC and wxWindowDC are implemented differently.
 // On many platforms, however, they will be the same.


@@ -45,12 +46,12 @@ class WXDLLEXPORT wxPaintDC: public wxDC
     
     ~wxPaintDC(void);
     
     
     ~wxPaintDC(void);
     

-    virtual void FloodFill( long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE );
+    virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE );

     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );
     virtual void CrossHair( long x, long y );
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );
     virtual void CrossHair( long x, long y );

-    virtual void DrawArc( long x1, long y1, long x2, long y2, double xc, double yc );
+    virtual void DrawArc( long x1, long y1, long x2, long y2, long xc, long yc );

     virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
     virtual void DrawPoint( long x, long y );
     
     virtual void DrawEllipticArc( long x, long y, long width, long height, double sa, double ea );
     virtual void DrawPoint( long x, long y );
     

diff --git a/include/wx/stubs/dirdlg.h b/include/wx/stubs/dirdlg.h
index fe36bb7fec90c094c5270bc272263dbb40651032..44f96238e2c21a0ce0046e0f1642d0cac1aa141e 100644 (file)
--- a/include/wx/stubs/dirdlg.h
+++ b/include/wx/stubs/dirdlg.h
@@ -18,6 +18,8 @@
 
 #include "wx/dialog.h"
 
 
 #include "wx/dialog.h"
 

+WXDLLEXPORT_DATA(extern const char*) wxFileSelectorPromptStr;
+

 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxDirDialog)
 class WXDLLEXPORT wxDirDialog: public wxDialog
 {
 DECLARE_DYNAMIC_CLASS(wxDirDialog)

diff --git a/include/wx/stubs/dnd.h b/include/wx/stubs/dnd.h
new file mode 100644 (file)
index 0000000..a7c29c6
--- /dev/null
+++ b/include/wx/stubs/dnd.h
@@ -0,0 +1,238 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        dnd.h
+// Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
+// Author:      AUTHOR
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 AUTHOR
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_DND_H_
+#define _WX_DND_H_
+
+#ifdef __GNUG__
+#pragma interface "dnd.h"
+#endif
+
+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/cursor.h"
+
+//-------------------------------------------------------------------------
+// classes
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxWindow;
+
+class WXDLLEXPORT wxDataObject;
+class WXDLLEXPORT wxTextDataObject;
+class WXDLLEXPORT wxFileDataObject;
+
+class WXDLLEXPORT wxDropTarget;
+class WXDLLEXPORT wxTextDropTarget;
+class WXDLLEXPORT wxFileDropTarget;
+
+class WXDLLEXPORT wxDropSource;
+
+//-------------------------------------------------------------------------
+// wxDataObject
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxDataObject: public wxObject
+{
+public:
+  // all data formats (values are the same as in windows.h, do not change!)
+  enum StdFormat
+  {
+    Invalid,
+    Text,
+    Bitmap,
+    MetafilePict,
+    Sylk,
+    Dif,
+    Tiff,
+    OemText,
+    Dib,
+    Palette,
+    Pendata,
+    Riff,
+    Wave,
+    UnicodeText,
+    EnhMetafile,
+    Hdrop,
+    Locale,
+    Max
+  };
+
+  // function to return symbolic name of clipboard format (debug messages)
+  static const char *GetFormatName(wxDataFormat format);
+
+  // ctor & dtor
+  wxDataObject() {};
+  ~wxDataObject() {};
+
+  // pure virtuals to override
+    // get the best suited format for our data
+  virtual wxDataFormat GetPreferredFormat() const = 0;
+    // decide if we support this format (should be one of values of
+    // StdFormat enumerations or a user-defined format)
+  virtual bool IsSupportedFormat(wxDataFormat format) const = 0;
+    // get the (total) size of data
+  virtual uint GetDataSize() const = 0;
+    // copy raw data to provided pointer
+  virtual void GetDataHere(void *pBuf) const = 0;
+
+};
+
+// ----------------------------------------------------------------------------
+// wxTextDataObject is a specialization of wxDataObject for text data
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxTextDataObject : public wxDataObject
+{
+public:
+  // ctors
+  wxTextDataObject() { }
+  wxTextDataObject(const wxString& strText) : m_strText(strText) { }
+  void Init(const wxString& strText) { m_strText = strText; }
+
+  // implement base class pure virtuals
+  virtual wxDataFormat GetPreferredFormat() const
+    { return wxDF_TEXT; }
+  virtual bool IsSupportedFormat(wxDataFormat format) const
+    { return format == wxDF_TEXT; }
+  virtual uint GetDataSize() const
+    { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
+  virtual void GetDataHere(void *pBuf) const
+    { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
+
+private:
+  wxString  m_strText;
+  
+};
+
+// ----------------------------------------------------------------------------
+// wxFileDataObject is a specialization of wxDataObject for file names
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileDataObject : public wxDataObject
+{
+public:
+
+  wxFileDataObject(void) { }
+  void AddFile( const wxString &file )
+    { m_files += file; m_files += ";"; }
+
+  // implement base class pure virtuals
+  virtual wxDataFormat GetPreferredFormat() const
+    { return wxDF_FILENAME; }
+  virtual bool IsSupportedFormat(wxDataFormat format) const
+    { return format == wxDF_FILENAME; }
+  virtual uint GetDataSize() const
+    { return m_files.Len() + 1; } // +1 for trailing '\0'of course
+  virtual void GetDataHere(void *pBuf) const
+    { memcpy(pBuf, m_files.c_str(), GetDataSize()); }
+
+private:
+  wxString  m_files;
+  
+};
+//-------------------------------------------------------------------------
+// wxDropTarget
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxDropTarget: public wxObject
+{
+  public:
+
+    wxDropTarget();
+    ~wxDropTarget();
+    
+    virtual void OnEnter() { }
+    virtual void OnLeave() { }
+    virtual bool OnDrop( long x, long y, const void *pData ) = 0;
+
+//  protected:
+      
+    friend wxWindow;
+    
+    // Override these to indicate what kind of data you support: 
+  
+    virtual size_t GetFormatCount() const = 0;
+    virtual wxDataFormat GetFormat(size_t n) const = 0;
+};
+
+//-------------------------------------------------------------------------
+// wxTextDropTarget
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxTextDropTarget: public wxDropTarget
+{
+  public:
+
+    wxTextDropTarget() {};
+    virtual bool OnDrop( long x, long y, const void *pData );
+    virtual bool OnDropText( long x, long y, const char *psz );
+    
+  protected:
+  
+    virtual size_t GetFormatCount() const;
+    virtual wxDataFormat GetFormat(size_t n) const;
+};
+
+// ----------------------------------------------------------------------------
+// A drop target which accepts files (dragged from File Manager or Explorer)
+// ----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxFileDropTarget: public wxDropTarget
+{
+  public:
+    
+    wxFileDropTarget() {};
+    
+    virtual bool OnDrop(long x, long y, const void *pData);
+    virtual bool OnDropFiles( long x, long y, 
+                              size_t nFiles, const char * const aszFiles[]);
+
+  protected:
+  
+    virtual size_t GetFormatCount() const;
+    virtual wxDataFormat GetFormat(size_t n) const;
+};
+
+//-------------------------------------------------------------------------
+// wxDropSource
+//-------------------------------------------------------------------------
+
+class WXDLLEXPORT wxDropSource: public wxObject
+{
+  public:
+
+  enum DragResult
+  {
+    Error,    // error prevented the d&d operation from completing
+    None,     // drag target didn't accept the data
+    Copy,     // the data was successfully copied
+    Move,     // the data was successfully moved
+    Cancel    // the operation was cancelled by user (not an error)
+  };
+
+    wxDropSource( wxWindow *win );
+    wxDropSource( wxDataObject &data, wxWindow *win );
+    
+    ~wxDropSource(void);
+    
+    void SetData( wxDataObject &data  );
+    DragResult DoDragDrop( bool bAllowMove = FALSE );
+    
+    virtual bool GiveFeedback( DragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; };
+
+  protected:
+  
+    wxDataObject  *m_data;
+};
+
+#endif  
+       //_WX_DND_H_
+

diff --git a/include/wx/stubs/font.h b/include/wx/stubs/font.h
index 2079f2d0f0ef819972d80f87e40b4c8101d86a08..601657c657897f59bf0c8dd791e64028e99dcfec 100644 (file)
--- a/include/wx/stubs/font.h
+++ b/include/wx/stubs/font.h
@@ -25,6 +25,7 @@ class WXDLLEXPORT wxFontRefData: public wxGDIRefData
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData();
     friend class WXDLLEXPORT wxFont;
 public:
     wxFontRefData();

+    wxFontRefData(const wxFontRefData& data);

     ~wxFontRefData();
 protected:
   int           m_pointSize;
     ~wxFontRefData();
 protected:
   int           m_pointSize;


@@ -81,6 +82,7 @@ public:
 
   // Implementation
 protected:
 
   // Implementation
 protected:

+  bool RealizeResource();

   void Unshare();
 };
 
   void Unshare();
 };
 

diff --git a/include/wx/stubs/mdi.h b/include/wx/stubs/mdi.h
index 1daec940083e68d3eff7c3e77af02cb293b14b84..6f9fc294e2abc327cd4b3eef69d407d54e92509b 100644 (file)
--- a/include/wx/stubs/mdi.h
+++ b/include/wx/stubs/mdi.h
@@ -57,6 +57,7 @@ public:
 
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);
 
   void OnSize(wxSizeEvent& event);
   void OnActivate(wxActivateEvent& event);

+  void OnSysColourChanged(wxSysColourChangedEvent& event);

 
   void SetMenuBar(wxMenuBar *menu_bar);
 
 
   void SetMenuBar(wxMenuBar *menu_bar);
 


@@ -84,6 +85,9 @@ public:
 
 protected:
 
 
 protected:
 

+  // TODO maybe have this member
+  wxMDIClientWindow     *m_clientWindow;
+

 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };
 

diff --git a/include/wx/stubs/metafile.h b/include/wx/stubs/metafile.h
index f4d04bcb637f47e5377a6963f52f40e4db5f3cbc..eb86b97a04e72214194586ba5726528acb9d8a54 100644 (file)
--- a/include/wx/stubs/metafile.h
+++ b/include/wx/stubs/metafile.h
@@ -39,7 +39,8 @@ class WXDLLEXPORT wxMetaFile: public wxObject
   virtual bool SetClipboard(int width = 0, int height = 0);
 
   virtual bool Play(wxDC *dc);
   virtual bool SetClipboard(int width = 0, int height = 0);
 
   virtual bool Play(wxDC *dc);

-  inline bool Ok() { return m_metaFile != 0; };
+  // TODO
+  inline bool Ok() { return FALSE; };

 
 /* TODO: Implementation
   inline WXHANDLE GetHMETAFILE() { return m_metaFile; }
 
 /* TODO: Implementation
   inline WXHANDLE GetHMETAFILE() { return m_metaFile; }

diff --git a/include/wx/stubs/notebook.h b/include/wx/stubs/notebook.h
index b5834ec1816fedcf1db5cda6a9b4f209cd14b079..9b0794f359ed0b8fb112cefda6b9bbce362ca745 100644 (file)
--- a/include/wx/stubs/notebook.h
+++ b/include/wx/stubs/notebook.h
@@ -18,7 +18,9 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

-#include <wx/dynarray.h>
+#include "wx/dynarray.h"
+#include "wx/event.h"
+#include "wx/control.h"

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types

diff --git a/include/wx/stubs/palette.h b/include/wx/stubs/palette.h
index a5c85bb1d067413310ad776cc4757fafb297278a..1d198fc6e31a66fa00bbb0539f9bfc3c02e14d4f 100644 (file)
--- a/include/wx/stubs/palette.h
+++ b/include/wx/stubs/palette.h
@@ -55,7 +55,6 @@ public:
   inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
 
   inline bool operator == (const wxPalette& palette) { return m_refData == palette.m_refData; }
   inline bool operator != (const wxPalette& palette) { return m_refData != palette.m_refData; }
 

-  virtual bool FreeResource(bool force = FALSE);

 /* TODO: implementation
   inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);
 /* TODO: implementation
   inline WXHPALETTE GetHPALETTE() const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
   void SetHPALETTE(WXHPALETTE pal);

diff --git a/include/wx/stubs/pen.h b/include/wx/stubs/pen.h
index 0e23c99daf07dd043ad4f64d87787c48a0247e13..da7b165e380542e600cb27e7ae4d09ed496563b7 100644 (file)
--- a/include/wx/stubs/pen.h
+++ b/include/wx/stubs/pen.h
@@ -17,8 +17,10 @@
 #endif
 
 #include "wx/gdiobj.h"
 #endif
 
 #include "wx/gdiobj.h"

+#include "wx/colour.h"
+#include "wx/bitmap.h"

 
 

-typedef    WXDWORD  wxDash ;
+typedef    long wxDash ;

 
 class WXDLLEXPORT wxPen;
 
 
 class WXDLLEXPORT wxPen;
 


@@ -91,7 +93,7 @@ public:
 // Implementation
 
   // Useful helper: create the brush resource
 // Implementation
 
   // Useful helper: create the brush resource

-  void RealizeResource();
+  bool RealizeResource();

 
   // When setting properties, we must make sure we're not changing
   // another object
 
   // When setting properties, we must make sure we're not changing
   // another object

diff --git a/include/wx/stubs/printdlg.h b/include/wx/stubs/printdlg.h
index cda8c082326ae60118b0bd71632d900641cd3d20..ac31a4909606ef557a500442171cd253779aff19 100644 (file)
--- a/include/wx/stubs/printdlg.h
+++ b/include/wx/stubs/printdlg.h
@@ -45,10 +45,6 @@ class WXDLLEXPORT wxPrintDialog: public wxDialog
  private:
   wxPrintData       m_printData;
   wxDC*             m_printerDC;
  private:
   wxPrintData       m_printData;
   wxDC*             m_printerDC;

-  bool              m_destroyDC;
-  char*             m_deviceName;
-  char*             m_driverName;
-  char*             m_portName;

   wxWindow*         m_dialogParent;
 };
 
   wxWindow*         m_dialogParent;
 };
 

diff --git a/include/wx/stubs/radiobut.h b/include/wx/stubs/radiobut.h
index 7a4ce62d50fcb307469fd4ba890e7fdb095dd763..8e8bf1313d37f062d16a793722c5f996ad76204a 100644 (file)
--- a/include/wx/stubs/radiobut.h
+++ b/include/wx/stubs/radiobut.h
@@ -48,8 +48,6 @@ class WXDLLEXPORT wxRadioButton: public wxControl
   virtual bool GetValue() const ;
 
   void Command(wxCommandEvent& event);
   virtual bool GetValue() const ;
 
   void Command(wxCommandEvent& event);

-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 };
 
 // Not implemented
 };
 
 // Not implemented

diff --git a/include/wx/stubs/region.h b/include/wx/stubs/region.h
index 02bf97845fecd20534ce1116e04fef5b43f3b6dc..6353a7dc16d8c0d2352ed9707e1a307c50f496ac 100644 (file)
--- a/include/wx/stubs/region.h
+++ b/include/wx/stubs/region.h
@@ -42,11 +42,6 @@ public:
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);
     wxRegion(long x, long y, long w, long h);
     wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
     wxRegion(const wxRect& rect);

-
-/* TODO: implementation
-    wxRegion(WXHRGN hRegion); // Hangs on to this region
-*/
-

        wxRegion();
        ~wxRegion();
 
        wxRegion();
        ~wxRegion();
 

diff --git a/include/wx/stubs/settings.h b/include/wx/stubs/settings.h
index 7cd3cbe19e834a16af4fbe64e275bb8127fd2d34..8ed994f1bab8120d636030b0c824401ce17ff36c 100644 (file)
--- a/include/wx/stubs/settings.h
+++ b/include/wx/stubs/settings.h
@@ -17,6 +17,10 @@
 #endif
 
 #include "wx/setup.h"
 #endif
 
 #include "wx/setup.h"

+#include "wx/defs.h"
+#include "wx/object.h"
+#include "wx/colour.h"
+#include "wx/font.h"

 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1
 
 #define wxSYS_WHITE_BRUSH         0
 #define wxSYS_LTGRAY_BRUSH        1

diff --git a/include/wx/stubs/setup.h b/include/wx/stubs/setup.h
index d28d09e43c22b3bd40b9d106e4a2e72a2c1ebfb3..dc99dbf74b33ea95f0fba74d0f6200a3b0662cc0 100644 (file)
--- a/include/wx/stubs/setup.h
+++ b/include/wx/stubs/setup.h
@@ -47,7 +47,10 @@
 #define USE_XFIG_SPLINE_CODE  1
                                // 1 for XFIG spline code, 0 for AIAI spline code.
 // AIAI spline code is slower, but freer of copyright issues.
 #define USE_XFIG_SPLINE_CODE  1
                                // 1 for XFIG spline code, 0 for AIAI spline code.
 // AIAI spline code is slower, but freer of copyright issues.

+                               // 0 for no splines

 
 

+#define USE_TOOLBAR     1
+                            // Use toolbars

 #define USE_DRAG_AND_DROP 1
                                // 0 for no drag and drop
 
 #define USE_DRAG_AND_DROP 1
                                // 0 for no drag and drop
 


@@ -78,7 +81,7 @@
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)
                                   // since you may well need to output
                                   // an error log in a production
                                   // version (or non-debugging beta)

-#define USE_GLOBAL_MEMORY_OPERATORS 1
+#define USE_GLOBAL_MEMORY_OPERATORS 0

                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 
                                   // In debug mode, cause new and delete to be redefined globally.
                                   // If this causes problems (e.g. link errors), set this to 0.
 

diff --git a/include/wx/stubs/statusbr.h b/include/wx/stubs/statusbr.h
index c0f83a26d0c4db828f367ef9901ffd8157f9794f..c5dcc0dc7d91c57741830d9e26e069696c8ee4f9 100644 (file)
--- a/include/wx/stubs/statusbr.h
+++ b/include/wx/stubs/statusbr.h
@@ -44,6 +44,10 @@ public:
   void OnSize(wxSizeEvent& event);
 
   DECLARE_EVENT_TABLE()
   void OnSize(wxSizeEvent& event);
 
   DECLARE_EVENT_TABLE()

+
+protected:
+  void CopyFieldsWidth(const int widths[]);
+  void SetFieldsWidth();

 };
 
 #endif
 };
 
 #endif

diff --git a/include/wx/stubs/wave.h b/include/wx/stubs/wave.h
index 485ead936dd201cf56a1b1911dc8e3ae736b9481..e55bd5aa5f4a220c725c37df5ca76fd28a309e12 100644 (file)
--- a/include/wx/stubs/wave.h
+++ b/include/wx/stubs/wave.h
@@ -35,7 +35,7 @@ protected:
   bool  Free();
 
 private:
   bool  Free();
 
 private:

-  byte* m_waveData;
+  char* m_waveData;

   int   m_waveLength;
   bool  m_isResource;
 };
   int   m_waveLength;
   bool  m_isResource;
 };

diff --git a/include/wx/stubs/window.h b/include/wx/stubs/window.h
index c024635909b099649d59f93209b93d633f818cbf..541dd58040c98bb197ae52f0a8913c45adbfab59 100644 (file)
--- a/include/wx/stubs/window.h
+++ b/include/wx/stubs/window.h
@@ -401,6 +401,8 @@ public:
                                        // (but doesn't delete the child object)
   virtual void DestroyChildren();  // Removes and destroys all children
 
                                        // (but doesn't delete the child object)
   virtual void DestroyChildren();  // Removes and destroys all children
 

+  inline bool IsBeingDeleted() const { return FALSE; } // TODO: Should probably eliminate this
+

   // Constraint implementation
   void UnsetConstraints(wxLayoutConstraints *c);
   inline wxList *GetConstraintsInvolvedIn() const ;
   // Constraint implementation
   void UnsetConstraints(wxLayoutConstraints *c);
   inline wxList *GetConstraintsInvolvedIn() const ;


@@ -432,9 +434,8 @@ public:
 
   wxObject *GetChild(int number) const ;
 
 
   wxObject *GetChild(int number) const ;
 

-  inline void SetShowing(bool show);
-  inline bool IsUserEnabled() const;
-  inline bool GetTransparentBackground() const ;
+  // Generates a new id for controls
+  static int NewControlId();

 
   // Responds to colour changes: passes event on to children.
   void OnSysColourChanged(wxSysColourChangedEvent& event);
 
   // Responds to colour changes: passes event on to children.
   void OnSysColourChanged(wxSysColourChangedEvent& event);


@@ -507,8 +508,6 @@ inline wxString wxWindow::GetName() const { return m_windowName; }
 inline void wxWindow::SetName(const wxString& name) { m_windowName = name; }
 inline long wxWindow::GetWindowStyleFlag() const { return m_windowStyle; }
 inline void wxWindow::SetWindowStyleFlag(long flag) { m_windowStyle = flag; }
 inline void wxWindow::SetName(const wxString& name) { m_windowName = name; }
 inline long wxWindow::GetWindowStyleFlag() const { return m_windowStyle; }
 inline void wxWindow::SetWindowStyleFlag(long flag) { m_windowStyle = flag; }

-inline void wxWindow::SetDoubleClick(bool flag) { m_doubleClickAllowed = flag; }
-inline bool wxWindow::GetDoubleClick() const { return m_doubleClickAllowed; }

 inline void wxWindow::SetEventHandler(wxEvtHandler *handler) { m_windowEventHandler = handler; }
 inline wxEvtHandler *wxWindow::GetEventHandler() const { return m_windowEventHandler; }
 inline void wxWindow::SetAutoLayout(bool a) { m_autoLayout = a; }
 inline void wxWindow::SetEventHandler(wxEvtHandler *handler) { m_windowEventHandler = handler; }
 inline wxEvtHandler *wxWindow::GetEventHandler() const { return m_windowEventHandler; }
 inline void wxWindow::SetAutoLayout(bool a) { m_autoLayout = a; }


@@ -527,14 +526,11 @@ inline wxButton *wxWindow::GetDefaultItem() const { return m_defaultItem; }
 inline void wxWindow::SetDefaultItem(wxButton *but) { m_defaultItem = but; }
 inline bool wxWindow::IsRetained() const { return ((m_windowStyle & wxRETAINED) == wxRETAINED); }
 
 inline void wxWindow::SetDefaultItem(wxButton *but) { m_defaultItem = but; }
 inline bool wxWindow::IsRetained() const { return ((m_windowStyle & wxRETAINED) == wxRETAINED); }
 

-inline void wxWindow::SetShowing(bool show) { m_isShown = show; }

 inline wxList *wxWindow::GetConstraintsInvolvedIn() const { return m_constraintsInvolvedIn; }
 inline wxSizer *wxWindow::GetSizer() const { return m_windowSizer; }
 inline wxWindow *wxWindow::GetSizerParent() const { return m_sizerParent; }
 inline void wxWindow::SetSizerParent(wxWindow *win) { m_sizerParent = win; }
 inline wxValidator *wxWindow::GetValidator() const { return m_windowValidator; }
 inline wxList *wxWindow::GetConstraintsInvolvedIn() const { return m_constraintsInvolvedIn; }
 inline wxSizer *wxWindow::GetSizer() const { return m_windowSizer; }
 inline wxWindow *wxWindow::GetSizerParent() const { return m_sizerParent; }
 inline void wxWindow::SetSizerParent(wxWindow *win) { m_sizerParent = win; }
 inline wxValidator *wxWindow::GetValidator() const { return m_windowValidator; }

-inline bool wxWindow::IsUserEnabled() const { return m_winEnabled; }
-inline bool wxWindow::GetTransparentBackground() const { return m_backgroundTransparent; }

 inline void wxWindow::SetReturnCode(int retCode) { m_returnCode = retCode; }
 inline int wxWindow::GetReturnCode() { return m_returnCode; }
 
 inline void wxWindow::SetReturnCode(int retCode) { m_returnCode = retCode; }
 inline int wxWindow::GetReturnCode() { return m_returnCode; }
 

diff --git a/include/wx/tab.h b/include/wx/tab.h
index 1f75593dd6a29e4fbc03f499fc77f111d22c3519..808f9c714652c1e8a70ea2b7e0035e49a56cfe8a 100644 (file)
--- a/include/wx/tab.h
+++ b/include/wx/tab.h
@@ -1,7 +1,7 @@
-#ifndef __TABH_BASE__
-#define __TABH_BASE__
+#ifndef _WX_TAB_H_BASE_
+#define _WX_TAB_H_BASE_

 
 #include "wx/generic/tabg.h"
 
 #endif
 
 #include "wx/generic/tabg.h"
 
 #endif

-    // __TABH_BASE__
+    // _WX_TAB_H_BASE_

diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index 13306d2212c984a0befe73e56d79cc9646f239a7..c766f72bf354b7ec91fa45ac09b7b9d960dc190b 100644 (file)
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -1,12 +1,16 @@
-#ifndef __TABCTRLH_BASE__
-#define __TABCTRLH_BASE__
+#ifndef _WX_TABCTRL_H_BASE_
+#define _WX_TABCTRL_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/tabctrl.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/tabctrl.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/tabctrl.h"
+#include "wx/motif/tabctrl.h"

 #elif defined(__WXGTK__)
 #elif defined(__WXGTK__)

+#elif defined(__WXMAC__)
+#include "wx/mac/tabctrl.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/tabctrl.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __TABCTRLH_BASE__
+    // _WX_TABCTRL_H_BASE_

diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
new file mode 100644 (file)
index 0000000..5b70d85
--- /dev/null
+++ b/include/wx/taskbar.h
@@ -0,0 +1,15 @@
+#ifndef _WX_TASKBAR_H_BASE_
+#define _WX_TASKBAR_H_BASE_
+
+#if defined(__WXMSW__)
+#include "wx/msw/taskbar.h"
+#elif defined(__WXMOTIF__)
+#elif defined(__WXGTK__)
+#elif defined(__WXQT__)
+#elif defined(__WXMAC__)
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/taskbar.h"
+#endif
+
+#endif
+    // _WX_TASKBAR_H_BASE_

diff --git a/include/wx/tbar95.h b/include/wx/tbar95.h
index eee04659aa1c982ca9c59fb9d0505b1f7cb849ce..5e1a009544cab2523c3a894406009c36c6edaaab 100644 (file)
--- a/include/wx/tbar95.h
+++ b/include/wx/tbar95.h
@@ -1,13 +1,13 @@
-#ifndef __TBAR95H_BASE__
-#define __TBAR95H_BASE__
+#ifndef _WX_TBAR95_H_BASE_
+#define _WX_TBAR95_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/tbar95.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/tbar95.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/tbar95.h"
+#include "wx/motif/tbar95.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/tbar95.h"
 #endif
 
 #endif
 #elif defined(__WXGTK__)
 #include "wx/gtk/tbar95.h"
 #endif
 
 #endif

-    // __TBAR95H_BASE__
+    // _WX_TBAR95_H_BASE_

diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index f8f537e27540b782cf367fb49baec6ec6bd28195..260b2526a0437ef4e52b439d8e05ff671a001efc 100644 (file)
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -9,17 +9,16 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TBARBASEH__
-#define __TBARBASEH__
+#ifndef _WX_TBARBASE_H_
+#define _WX_TBARBASE_H_

 
 #ifdef __GNUG__
 #pragma interface "tbarbase.h"
 #endif
 
 
 #ifdef __GNUG__
 #pragma interface "tbarbase.h"
 #endif
 

+#include "wx/setup.h"

 #include "wx/defs.h"
 
 #include "wx/defs.h"
 

-#if USE_TOOLBAR
-

 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/control.h"


@@ -239,7 +238,6 @@ public:
     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-#endif // USE_TOOLBAR

 #endif
 #endif

-    // __TBARBASEH__
+    // _WX_TBARBASE_H_

 
 

diff --git a/include/wx/tbarmsw.h b/include/wx/tbarmsw.h
index 7e5f343b86eea56ed03fe4f215c37091ea798737..4b9d761fcfb87d08c63d71c4ddf318c5ace20271 100644 (file)
--- a/include/wx/tbarmsw.h
+++ b/include/wx/tbarmsw.h
@@ -1,13 +1,13 @@
-#ifndef __TBARMSWH_BASE__
-#define __TBARMSWH_BASE__
+#ifndef _WX_TBARMSW_H_BASE_
+#define _WX_TBARMSW_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/tbarmsw.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/tbarmsw.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/tbarmsw.h"
+#include "wx/motif/tbarmsw.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/tbarmsw.h"
 #endif
 
 #endif
 #elif defined(__WXGTK__)
 #include "wx/gtk/tbarmsw.h"
 #endif
 
 #endif

-    // __TBARMSWH_BASE__
+    // _WX_TBARMSW_H_BASE_

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 7b44d3f1099954a52b2f0dc494816654c3a54d2a..add138a78d2c0a080a153f45b9aad9260f67184e 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TBARSMPLH__
-#define __TBARSMPLH__
+#ifndef _WX_TBARSMPLH__
+#define _WX_TBARSMPLH__

 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"
 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"


@@ -75,5 +75,5 @@ DECLARE_EVENT_TABLE()
 
 #endif // USE_TOOLBAR
 #endif
 
 #endif // USE_TOOLBAR
 #endif

-    // __TBARSMPLH__
+    // _WX_TBARSMPLH__

 
 

diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index c90818f5f3348bb771dd90447df034afefcadc3f..4123afeb1fff0e5e4b8d56461a422d306409f3fa 100644 (file)
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -1,15 +1,19 @@
-#ifndef __TEXTCTRLH_BASE__
-#define __TEXTCTRLH_BASE__
+#ifndef _WX_TEXTCTRL_H_BASE_
+#define _WX_TEXTCTRL_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/textctrl.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/textctrl.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/textctrl.h"
+#include "wx/motif/textctrl.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/textctrl.h"
 #elif defined(__WXQT__)
 #include "wx/qt/textctrl.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/textctrl.h"
 #elif defined(__WXQT__)
 #include "wx/qt/textctrl.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/textctrl.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/textctrl.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __TEXTCTRLH_BASE__
+    // _WX_TEXTCTRL_H_BASE_

diff --git a/include/wx/textdlg.h b/include/wx/textdlg.h
index 4404fe1435328bf0f9141bf5a0278c9d1e8edd38..491bd8b4fa8c2a84834a631533ab5cb601dd61ae 100644 (file)
--- a/include/wx/textdlg.h
+++ b/include/wx/textdlg.h
@@ -1,7 +1,7 @@
-#ifndef __TEXTDLGH_BASE__
-#define __TEXTDLGH_BASE__
+#ifndef _WX_TEXTDLG_H_BASE_
+#define _WX_TEXTDLG_H_BASE_

 
 #include "wx/generic/textdlgg.h"
 
 #endif
 
 #include "wx/generic/textdlgg.h"
 
 #endif

-    // __TEXTDLGH_BASE__
+    // _WX_TEXTDLG_H_BASE_

diff --git a/include/wx/thread.h b/include/wx/thread.h
index 64481d7c8854aa42327c6fc4828a57424604717c..c4034bb68930492821777ac28e8dec6941ba2c6c 100644 (file)
--- a/include/wx/thread.h
+++ b/include/wx/thread.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __THREADH__
-#define __THREADH__
+#ifndef _WX_THREADH__
+#define _WX_THREADH__

 
 #ifdef __GNUG__
 #pragma interface "thread.h"
 
 #ifdef __GNUG__
 #pragma interface "thread.h"

diff --git a/include/wx/time.h b/include/wx/time.h
index 05c5a263e646624e480e5b65039003e67699a842..74461c55afcbfeacdf19b55acae98cb867321c49 100644 (file)
--- a/include/wx/time.h
+++ b/include/wx/time.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TIMEH__
-#define __TIMEH__
+#ifndef _WX_TIMEH__
+#define _WX_TIMEH__

 
 #include "wx/object.h"
 
 
 #include "wx/object.h"
 


@@ -93,5 +93,5 @@ public:
 #endif
   // USE_TIMEDATE
 #endif
 #endif
   // USE_TIMEDATE
 #endif

-    // __TIMEH__
+    // _WX_TIMEH__

 
 

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 65acce19da2247505e884826c32f9bcbb519d28b..4cf5c35b26226ea09768193bd3b8497152f7d118 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,15 +1,19 @@
-#ifndef __TIMERH_BASE__
-#define __TIMERH_BASE__
+#ifndef _WX_TIMER_H_BASE_
+#define _WX_TIMER_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/timer.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/timer.h"
+#include "wx/motif/timer.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"
 #elif defined(__WXQT__)
 #include "wx/qt/timer.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/timer.h"
 #elif defined(__WXQT__)
 #include "wx/qt/timer.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/timer.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/timer.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __TIMERH_BASE__
+    // _WX_TIMER_H_BASE_

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 4b5c73acfbab9ddad3f6b356637a11db24e4d80f..3e09456f594782028c3887458630dc76622e5568 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -15,6 +15,10 @@
 #   include "wx/gtk/tbargtk.h"
 #elif defined(__WXQT__)
 #   include "wx/qt/tbarqt.h"
 #   include "wx/gtk/tbargtk.h"
 #elif defined(__WXQT__)
 #   include "wx/qt/tbarqt.h"

+#elif defined(__WXMAC__)
+#   include "wx/mac/toolbar.h"
+#elif defined(__WXSTUBS__)
+#   include "wx/stubs/toolbar.h"

 #endif
 
 #endif
 #endif
 
 #endif

diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index bb4644ccff790c7518cbffa404a511615bbede2d..8d6928b669a46fde9046bee44a62f5a556de35c6 100644 (file)
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,13 +1,19 @@
-#ifndef __TREECTRLH_BASE__
-#define __TREECTRLH_BASE__
+#ifndef _WX_TREECTRL_H_BASE_
+#define _WX_TREECTRL_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/treectrl.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/treectrl.h"
 #elif defined(__WXGTK__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/treectrl.h"
 #elif defined(__WXMOTIF__)
 #include "wx/generic/treectrl.h"
 #elif defined(__WXGTK__)

+#include "wx/gtk/treectrl.h"
+#elif defined(__WXQT__)
+#include "wx/qt/treectrl.h"
+#elif defined(__WXMAC__)
+#include "wx/generic/treectrl.h"
+#elif defined(__WXSTUBS__)

 #include "wx/generic/treectrl.h"
 #endif
 
 #endif
 #include "wx/generic/treectrl.h"
 #endif
 
 #endif

-    // __TREECTRLH_BASE__
+    // _WX_TREECTRL_H_BASE_

diff --git a/include/wx/types.h b/include/wx/types.h
index 9545eae4de90f85add49053c73efdb4594f60ed7..962783f38785343e31ac36c977518c2bbff41103 100644 (file)
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __TYPESH__
-#define __TYPESH__
+#ifndef _WX_TYPESH__
+#define _WX_TYPESH__

 
 #ifdef __GNUG__
 // #pragma interface "types.h"
 
 #ifdef __GNUG__
 // #pragma interface "types.h"


@@ -93,5 +93,5 @@
 #define wxTYPE_USER            500
 
 #endif
 #define wxTYPE_USER            500
 
 #endif

-    // __TYPESH__
+    // _WX_TYPESH__

 
 

diff --git a/include/wx/utils.h b/include/wx/utils.h
index a8603a3fc84f373589dc4944f6eb61a83278777f..aff90975c103bf04f354485b7229ed10ebb1aaea 100644 (file)
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __UTILSH__
-#define __UTILSH__
+#ifndef _WX_UTILSH__
+#define _WX_UTILSH__

 
 #ifdef __GNUG__
 #pragma interface "utils.h"
 
 #ifdef __GNUG__
 #pragma interface "utils.h"


@@ -309,4 +309,4 @@ void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
 #endif //__X__
 
 #endif
 #endif //__X__
 
 #endif

-    // __UTILSH__
+    // _WX_UTILSH__

diff --git a/include/wx/validate.h b/include/wx/validate.h
index f068eb225c664e4e2237cbb1656fe7f6eff80d85..deb5d79856199431c43c81d06d9062c296af5015 100644 (file)
--- a/include/wx/validate.h
+++ b/include/wx/validate.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __VALIDATEH__
-#define __VALIDATEH__
+#ifndef _WX_VALIDATEH__
+#define _WX_VALIDATEH__

 
 #ifdef __GNUG__
 #pragma interface "validate.h"
 
 #ifdef __GNUG__
 #pragma interface "validate.h"


@@ -67,4 +67,4 @@ protected:
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 
 #endif
 WXDLLEXPORT_DATA(extern const wxValidator) wxDefaultValidator;
 
 #endif

-    // __VALIDATEH__
+    // _WX_VALIDATEH__

diff --git a/include/wx/valtext.h b/include/wx/valtext.h
index 26422a77d81ca8e7286c9321b7c2450d58e8ae78..b63fcaf4e231c9ba972faf71156429b02ae3904a 100644 (file)
--- a/include/wx/valtext.h
+++ b/include/wx/valtext.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __VALTEXTH__
-#define __VALTEXTH__
+#ifndef _WX_VALTEXTH__
+#define _WX_VALTEXTH__

 
 #ifdef __GNUG__
 #pragma interface "valtext.h"
 
 #ifdef __GNUG__
 #pragma interface "valtext.h"

diff --git a/include/wx/version.h b/include/wx/version.h
index 9e1a8e5728bb51d08dd40e7d5367b9ca83518af7..68f7db190ea2df33942fce7412001ea2281dbbe3 100644 (file)
--- a/include/wx/version.h
+++ b/include/wx/version.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __VERSIONH__
-#define __VERSIONH__
+#ifndef _WX_VERSIONH__
+#define _WX_VERSIONH__

 
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2
 
 /* Bump-up with each new version */
 #define wxMAJOR_VERSION    2


@@ -22,4 +22,4 @@
 #define wxVERSION_FLOAT float(wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0))
 
 #endif
 #define wxVERSION_FLOAT float(wxMAJOR_VERSION + (wxMINOR_VERSION/10.0) + (wxRELEASE_NUMBER/100.0) + (wxBETA_NUMBER/10000.0))
 
 #endif

-       // __VERSIONH__
+       // _WX_VERSIONH__

diff --git a/include/wx/window.h b/include/wx/window.h
index e26cbbc9b1beefcf64f1848c71de66377658fcea..583eb9fb07457e0a552bddc81caa30afc8d51e6c 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1,15 +1,19 @@
-#ifndef __WINDOWH_BASE__
-#define __WINDOWH_BASE__
+#ifndef _WX_WINDOW_H_BASE_
+#define _WX_WINDOW_H_BASE_

 
 #if defined(__WXMSW__)
 #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)
 
 #if defined(__WXMSW__)
 #include "wx/msw/window.h"
 #elif defined(__WXMOTIF__)

-#include "wx/xt/window.h"
+#include "wx/motif/window.h"

 #elif defined(__WXGTK__)
 #include "wx/gtk/window.h"
 #elif defined(__WXQT__)
 #include "wx/qt/window.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/window.h"
 #elif defined(__WXQT__)
 #include "wx/qt/window.h"

+#elif defined(__WXMAC__)
+#include "wx/mac/window.h"
+#elif defined(__WXSTUBS__)
+#include "wx/stubs/window.h"

 #endif
 
 #endif
 #endif
 
 #endif

-    // __WINDOWH_BASE__
+    // _WX_WINDOW_H_BASE_

diff --git a/include/wx/wx.h b/include/wx/wx.h
index 4a8529e696c0c1e0099b2931d0e1c5c0013785b4..bb68d0fe786694914e916fee05eda1fbc174fd57 100644 (file)
--- a/include/wx/wx.h
+++ b/include/wx/wx.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXH__
-#define __WXH__
+#ifndef _WX_WXH__
+#define _WX_WXH__

 
 #include "wx/setup.h"           // Which features to include - user editable
 #include "wx/defs.h"
 
 #include "wx/setup.h"           // Which features to include - user editable
 #include "wx/defs.h"


@@ -67,4 +67,4 @@
 #include "wx/intl.h"
 
 #endif
 #include "wx/intl.h"
 
 #endif

-    // __WXH__
+    // _WX_WXH__

diff --git a/include/wx/wxexpr.h b/include/wx/wxexpr.h
index 11227e20829a347d5afa54db35155a85b5d6c6b5..89a29f9f93ee09c7047851bb5b10d0b8fc62353c 100644 (file)
--- a/include/wx/wxexpr.h
+++ b/include/wx/wxexpr.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __WXEXPRH__
-#define __WXEXPRH__
+#ifndef _WX_WXEXPRH__
+#define _WX_WXEXPRH__

 
 #ifdef __GNUG__
 #pragma interface "wxexpr.h"
 
 #ifdef __GNUG__
 #pragma interface "wxexpr.h"

diff --git a/include/wx/wxprec.h b/include/wx/wxprec.h
index 71018481a8325b2946764fc9eedfdddef8781fc5..9e12d8f875b7291a33bd827b80c42399d1befd21 100644 (file)
--- a/include/wx/wxprec.h
+++ b/include/wx/wxprec.h
@@ -10,7 +10,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers
 /////////////////////////////////////////////////////////////////////////////
 
 // check if to use precompiled headers

-#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) // && !defined(WXMAKINGDLL)
+#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__WATCOMC__) || defined(__GNUWIN32__)) && defined(__WXMSW__)

 #if !NOPCH
 #define WX_PRECOMP
 #endif
 #if !NOPCH
 #define WX_PRECOMP
 #endif

diff --git a/include/wx/zstream.h b/include/wx/zstream.h
index 326058f3fb61502b14e7d1bf55b95362ad806390..6d68c5fc75b0849ae98b3ea4e8a2e27f524a82da 100644 (file)
--- a/include/wx/zstream.h
+++ b/include/wx/zstream.h
@@ -8,8 +8,8 @@
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Guilhem Lavaux
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WXZSTREAM_H__
-#define __WXZSTREAM_H__
+#ifndef _WX_WXZSTREAM_H__
+#define _WX_WXZSTREAM_H__

 
 #ifdef __GNUG__
 #pragma interface
 
 #ifdef __GNUG__
 #pragma interface

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 19d2589a387a2ec3dbdfc139b0fc6a4f2e2ac2b5..e32e8a0b31d9f9fe85337b62c1633acf053fcf04 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -22,6 +22,7 @@
 
 #ifndef WX_PRECOMP
 #include <stdio.h>
 
 #ifndef WX_PRECOMP
 #include <stdio.h>

+#include "wx/string.h"

 #include "wx/utils.h"
 #include "wx/app.h"
 #endif
 #include "wx/utils.h"
 #include "wx/app.h"
 #endif


@@ -331,7 +332,7 @@ wxPageSetupData::wxPageSetupData(void)
 
 wxPageSetupData::~wxPageSetupData(void)
 {
 
 wxPageSetupData::~wxPageSetupData(void)
 {

-#if defined(__WIN95__)
+#if defined(__WIN95__) && defined(__WXMSW__)

     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);


@@ -358,7 +359,7 @@ void wxPageSetupData::operator=(const wxPageSetupData& data)
   m_enableHelp = data.m_enableHelp;
 }
 
   m_enableHelp = data.m_enableHelp;
 }
 

-#if defined(__WIN95__)
+#if defined(__WXMSW__) && defined(__WIN95__)

 void wxPageSetupData::ConvertToNative(void)
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
 void wxPageSetupData::ConvertToNative(void)
 {
     PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;

diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index bcf1f64bb3055788a48e65a1ba1a7620d5d35e8e..cc94f2fd0432e5eae5f498ebf91471a295508fda 100644 (file)
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -27,6 +27,7 @@
 #if USE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP
 #if USE_DOC_VIEW_ARCHITECTURE
 
 #ifndef WX_PRECOMP

+#include "wx/string.h"

 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/dc.h"
 #include "wx/utils.h"
 #include "wx/app.h"
 #include "wx/dc.h"

diff --git a/src/common/file.cpp b/src/common/file.cpp
index 48683353e0b8c333b2d40bb45048c8be5d741e74..b32441ff971e65800473bf7258e39cb043be63e2 100644 (file)
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -53,6 +53,9 @@
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>
   #include  <windows.h>     // for GetTempFileName
 #elif (defined(__UNIX__) || defined(__GNUWIN32__))
   #include  <unistd.h>

+#elif (defined(__WXSTUBS__))
+  // Have to ifdef this for different environments
+  #include <io.h>

 #else
   #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX
 #else
   #error  "Please specify the header with file functions declarations."
 #endif  //Win/UNIX


@@ -94,6 +97,11 @@
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #endif  //_MSC_VER
 
   #define   tell(fd)    lseek(fd, 0, SEEK_CUR)
 #endif  //_MSC_VER
 

+#ifdef __BORLANDC__
+  #define   W_OK        2
+  #define   R_OK        4
+#endif
+

 // there is no distinction between text and binary files under Unix
 #ifdef    __UNIX__
   #define   O_BINARY    (0)
 // there is no distinction between text and binary files under Unix
 #ifdef    __UNIX__
   #define   O_BINARY    (0)


@@ -418,7 +426,7 @@ bool wxTempFile::Open(const wxString& strName)
   // otherwise rename() in Commit() might not work (if the files are on
   // different partitions for example). Unfortunately, the only standard
   // (POSIX) temp file creation function tmpnam() can't do it.
   // otherwise rename() in Commit() might not work (if the files are on
   // different partitions for example). Unfortunately, the only standard
   // (POSIX) temp file creation function tmpnam() can't do it.

-  #ifdef  __UNIX__
+  #if defined(__UNIX__) || defined(__WXSTUBS__)

     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change
     static const char *szMktempSuffix = "XXXXXX";
     m_strTemp << strName << szMktempSuffix;
     mktemp((char *)m_strTemp.c_str()); // will do because length doesn't change

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 24d10b9833054977f866c2928537af6b676d4334..655cd217db3cb44baec93f43eb55b114ffc543cd 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -85,6 +85,9 @@ wxString wxFileConfig::GetGlobalDir()
 
   #ifdef __UNIX__
     strDir = "/etc/";
 
   #ifdef __UNIX__
     strDir = "/etc/";

+  #elif defined(__WXSTUBS__)
+    // TODO
+    wxASSERT( TRUE ) ;

   #else // Windows
     #ifndef _MAX_PATH
       #define _MAX_PATH 512
   #else // Windows
     #ifndef _MAX_PATH
       #define _MAX_PATH 512

diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index 90b49c111d04b1ac6dd5cf708f972a910db11f56..295aca336ba586b094f3a6a97ad7e1b15fff6071 100644 (file)
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -46,7 +46,7 @@
 #include <dirent.h>
 #endif
 
 #include <dirent.h>
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #ifndef __GNUWIN32__
 #include <direct.h>
 #include <dos.h>
 #ifndef __GNUWIN32__
 #include <direct.h>
 #include <dos.h>


@@ -70,7 +70,7 @@
 #include <dir.h>
 #endif
 
 #include <dir.h>
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 #include "windows.h"
 #endif
 
 #include "windows.h"
 #endif
 


@@ -91,7 +91,7 @@ void wxPathList::Add (const wxString& path)
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const char PATH_TOKS[] =
 void wxPathList::AddEnvList (const wxString& envVariable)
 {
   static const char PATH_TOKS[] =

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

        " ;"; // Don't seperate with colon in DOS (used for drive)
 #else
        " :;";
        " ;"; // Don't seperate with colon in DOS (used for drive)
 #else
        " :;";


@@ -136,7 +136,7 @@ bool wxPathList::Member (const wxString& path)
   {
       wxString path2((char *) node->Data ());
       if (
   {
       wxString path2((char *) node->Data ());
       if (

-#if defined(__WXMSW__) || defined(__VMS__)
+#if defined(__WINDOWS__) || defined(__VMS__)

       // Case INDEPENDENT
          path.CompareTo (path2, wxString::ignoreCase) == 0
 #else
       // Case INDEPENDENT
          path.CompareTo (path2, wxString::ignoreCase) == 0
 #else


@@ -167,7 +167,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
       if (ch != '\\' && ch != '/')
         strcat (wxBuffer, "/");
       strcat (wxBuffer, filename);
       if (ch != '\\' && ch != '/')
         strcat (wxBuffer, "/");
       strcat (wxBuffer, filename);

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       Unix2DosFilename (wxBuffer);
 #endif
       if (wxFileExists (wxBuffer))
       Unix2DosFilename (wxBuffer);
 #endif
       if (wxFileExists (wxBuffer))


@@ -194,7 +194,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
       lastCh = buf[len-1];
     if (lastCh != '/' && lastCh != '\\')
     {
       lastCh = buf[len-1];
     if (lastCh != '/' && lastCh != '\\')
     {

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       strcat(buf, "\\");
 #else
       strcat(buf, "/");
       strcat(buf, "\\");
 #else
       strcat(buf, "/");


@@ -237,7 +237,7 @@ wxIsAbsolutePath (const wxString& filename)
 #ifdef __VMS__
       || (filename[0] == '[' && filename[1] != '.')
 #endif
 #ifdef __VMS__
       || (filename[0] == '[' && filename[1] != '.')
 #endif

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif
       /* MSDOS */
       || filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
 #endif


@@ -847,7 +847,11 @@ bool wxMkdir(const wxString& dir)
 #ifdef __VMS__
        return FALSE;
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
 #ifdef __VMS__
        return FALSE;
 #elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)

+#if defined(__WIN32__) // Could happen in __WXSTUBS__ mode
+  return (mkdir(WXSTRINGCAST dir) == 0);
+#else

   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
   return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);

+#endif

 #else
   return (mkdir(WXSTRINGCAST dir) == 0);
 #endif
 #else
   return (mkdir(WXSTRINGCAST dir) == 0);
 #endif


@@ -924,7 +928,7 @@ bool wxPathExists(const char *pszPathName)
 // Get a temporary filename, opening and closing the file.
 char *wxGetTempFileName(const wxString& prefix, char *buf)
 {
 // Get a temporary filename, opening and closing the file.
 char *wxGetTempFileName(const wxString& prefix, char *buf)
 {

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 #ifndef        __WIN32__
   char tmp[144];
 
 #ifndef        __WIN32__
   char tmp[144];


@@ -1260,7 +1264,7 @@ bool wxSetWorkingDirectory(const wxString& d)
 {
 #ifdef __UNIX__
   return (chdir(d) == 0);
 {
 #ifdef __UNIX__
   return (chdir(d) == 0);

-#elif defined(__WXMSW__)
+#elif defined(__WINDOWS__)

 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);
 
 #ifdef __WIN32__
   return (bool)(SetCurrentDirectory(d) != 0);

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 639619c5a7a5f72084abfa6f8e79828de7e20447..543e78e18d6ccd256333175e40f3e0f9edd739a6 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -257,6 +257,12 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
   else return NULL;
 #endif
 
   else return NULL;
 #endif
 

+// TODO for other implementations. This should really go into
+// platform-specific directories.
+#ifdef __WXSTUBS__
+  else return NULL;
+#endif
+

 #ifdef __WXGTK__
   else {
     wxColour *col = new wxColour( colour );
 #ifdef __WXGTK__
   else {
     wxColour *col = new wxColour( colour );

diff --git a/src/common/log.cpp b/src/common/log.cpp
index d23a3e1c8f070d82eee733ccd2b2d7f5754141f9..94bf306c7401ca72b66ba0c7f999451db549d40f 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -33,6 +33,7 @@
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/menu.h>
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/menu.h>

+  #include  <wx/frame.h>

 
   #include  <wx/generic/msgdlgg.h>
   #include  <wx/filedlg.h>
 
   #include  <wx/generic/msgdlgg.h>
   #include  <wx/filedlg.h>


@@ -489,7 +490,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
         {
           wxString strTime = TimeStamp();
 
         {
           wxString strTime = TimeStamp();
 

-          #ifdef  __WIN32__
+          #if defined(__WIN32__) && !defined(__WXSTUBS__)

               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");
               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");


@@ -905,6 +906,8 @@ void Trap()
 {
   #ifdef __WXMSW__
     DebugBreak();
 {
   #ifdef __WXMSW__
     DebugBreak();

+  #elif defined(__WXSTUBS__)
+    // TODO

   #else // Unix
     raise(SIGTRAP);
   #endif // Win/Unix
   #else // Unix
     raise(SIGTRAP);
   #endif // Win/Unix

diff --git a/src/common/tbarsmpl.cpp b/src/common/tbarsmpl.cpp
index a75de10e3bd0a7628975081d4e633de70d6aaba5..748dfa11175ab73f0544c3ce5403ef45bab3c228 100644 (file)
--- a/src/common/tbarsmpl.cpp
+++ b/src/common/tbarsmpl.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx.h"
+#include "wx/wx.h"

 #endif
 
 #if USE_TOOLBAR
 #endif
 
 #if USE_TOOLBAR


@@ -212,8 +212,8 @@ void wxToolBarSimple::DrawTool(wxDC& dc, wxMemoryDC& memDC, wxToolBarTool *tool)
 
   if (bitmap && bitmap->Ok())
   {
 
   if (bitmap && bitmap->Ok())
   {

-    if (bitmap->GetColourMap())
-      memDC.SetPalette(*bitmap->GetColourMap());
+    if (bitmap->GetPalette())
+      memDC.SetPalette(*bitmap->GetPalette());

 
     int ax = (int)tool->m_x,
         ay = (int)tool->m_y,
 
     int ax = (int)tool->m_x,
         ay = (int)tool->m_y,

diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index f52f9480a57f034b9b17a50f873b7b8a8339f874..d67663557e87a83a4b6cecd1b90549a0409c1820 100644 (file)
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -39,11 +39,11 @@
 
 // default type is the native one
 const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
 
 // default type is the native one
 const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::

-#if   defined(__WXMSW__)
+#if   defined(__WINDOWS__)

   Type_Dos;
 #elif defined(__UNIX__)
   Type_Unix;
   Type_Dos;
 #elif defined(__UNIX__)
   Type_Unix;

-#elif defined(__MAC__)
+#elif defined(__WXMAC__)

   Type_Mac;
   // if you feel brave, remove the next line
   #error  "wxTextFile: code for Mac files is untested."
   Type_Mac;
   // if you feel brave, remove the next line
   #error  "wxTextFile: code for Mac files is untested."

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index a1e02d73a358dd240d6a9f979c8db4f090133cb0..2fbcb4c90630ee555c5cfd5f0b28cc0834d99015 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -168,6 +168,8 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
   *timeZone = tp->tm_gmtoff; // ???
   *dstObserved = tp->tm_isdst;
 #endif
   *timeZone = tp->tm_gmtoff; // ???
   *dstObserved = tp->tm_isdst;
 #endif

+#elif defined(__WXSTUBS__)
+  return FALSE;

 #else
 // #error wxGetLocalTime not implemented.
   struct timeval tp;
 #else
 // #error wxGetLocalTime not implemented.
   struct timeval tp;

diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 235b5c146028a1fe3854c41d6dd4a3f59e3e96e6..3fd650a0d2293608788134c872a8ea354d7cb4ac 100644 (file)
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -109,7 +109,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
 }
 #endif
 
 }
 #endif
 

-#ifdef __WXMSW__
+#ifdef __WINDOWS__

 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp
 
 #ifndef __GNUWIN32__
 #define strcasecmp stricmp

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index b9965c12938d73ba8ae6ae62c47b8852b7d064dd..9081e3b5ba397ab9de1c3a92db6d6b8678463172 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -306,17 +306,25 @@ bool wxGenericGrid::CreateGrid(int nRows, int nCols, wxString **cellValues, shor
   int objectSizeX = m_totalCols;
   int pageSizeX = 1;
   int viewLengthX = m_totalCols;
   int objectSizeX = m_totalCols;
   int pageSizeX = 1;
   int viewLengthX = m_totalCols;

+
+/*

   m_hScrollBar->SetViewLength(viewLengthX);
   m_hScrollBar->SetObjectLength(objectSizeX);
   m_hScrollBar->SetPageSize(pageSizeX);
   m_hScrollBar->SetViewLength(viewLengthX);
   m_hScrollBar->SetObjectLength(objectSizeX);
   m_hScrollBar->SetPageSize(pageSizeX);

+*/
+  m_hScrollBar->SetScrollbar(m_hScrollBar->GetPosition(), pageSizeX, objectSizeX, viewLengthX);

 
   int objectSizeY = m_totalRows;
   int pageSizeY = 1;
   int viewLengthY = m_totalRows;
 
 
   int objectSizeY = m_totalRows;
   int pageSizeY = 1;
   int viewLengthY = m_totalRows;
 

+/*

   m_vScrollBar->SetViewLength(viewLengthY);
   m_vScrollBar->SetObjectLength(objectSizeY);
   m_vScrollBar->SetPageSize(pageSizeY);
   m_vScrollBar->SetViewLength(viewLengthY);
   m_vScrollBar->SetObjectLength(objectSizeY);
   m_vScrollBar->SetPageSize(pageSizeY);

+*/
+
+  m_vScrollBar->SetScrollbar(m_vScrollBar->GetPosition(), pageSizeY, objectSizeY, viewLengthY);

 
   AdjustScrollbars();
 
 
   AdjustScrollbars();
 


@@ -842,7 +850,7 @@ void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int
     dc->SetBrush(*cell->GetBackgroundBrush());
     dc->SetPen(*wxTRANSPARENT_PEN);
     
     dc->SetBrush(*cell->GetBackgroundBrush());
     dc->SetPen(*wxTRANSPARENT_PEN);
     

-#ifdef 0    // In wxWin 2.0 the dc code is exact. RR.
+#if 0    // In wxWin 2.0 the dc code is exact. RR.

 #ifdef __WXMOTIF__
     dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
 #else
 #ifdef __WXMOTIF__
     dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
 #else

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index 7f0ec5df0f93815b35bca7605be4813778434ace..9b23bbff8f5511e4a654ad6d812778c13350d758 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -112,8 +112,6 @@ wxSplitterWindow::wxSplitterWindow(wxWindow *parent, wxWindowID id, const wxPoin
     // Eventually, we'll respond to colour change messages
     InitColours();
 
     // Eventually, we'll respond to colour change messages
     InitColours();
 

-    SetDoubleClick(TRUE);
-

     // For debugging purposes, to see the background.
 //    SetBackground(wxBLUE_BRUSH);
 }
     // For debugging purposes, to see the background.
 //    SetBackground(wxBLUE_BRUSH);
 }

diff --git a/src/makeb32.env b/src/makeb32.env
index 2ecc973fdbfd970c253a7e007a3b93649c4b64d1..57e62fa08104eca3e13864e7d571db212701c07d 100644 (file)
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -4,7 +4,7 @@ WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXINC = $(WXDIR)\include

-WIN95FLAG = -D__WIN95__
+WIN95FLAG = -D__WIN95__ -D__WINDOWS__

 
 !ifndef FINAL
 FINAL=0
 
 !ifndef FINAL
 FINAL=0

diff --git a/src/makeg95.env b/src/makeg95.env
index 2a0ace01a58fbe127ba43bd1e0dc884c4baf9e91..d9aa03c77650db8520e71f3e3c33cc1aadef65bc 100644 (file)
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -101,19 +101,8 @@ RSCSUFF=rsc
 # many things as we can, to catch portability problems sooner.
 WARN = -Wall
 
 # many things as we can, to catch portability problems sooner.
 WARN = -Wall
 

-# -pedantic -Wpointer-arith -Wtraditional -Wcast-align \
-# -Wenum-clash -Wnested-externs -Woverloaded-virtual \
-# -Winline -Wconversion
-
-# not good with too few 'const' decls in wxWindows
-# -Wcast-qual -Wwrite-strings
-
-# too hard (problems with system header files)
-# -Wstrict-prototypes -Wmissing-prototypes
-# -Wredudant-decs
-

 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
 # Which GUI, -Dwx_xview or -Dwx_motif (don't change this)

-GUI = -D__WXMSW__
+GUI = -D__WXMSW__ -D__WINDOWS__

 
 # Optimization
 # OPT = -O
 
 # Optimization
 # OPT = -O


@@ -126,7 +115,6 @@ OPT =
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 AROPTIONS = ruv
 RANLIB = ranlib
 # AROPTIONS = crs # For IRIX and Solaris (both SYSVR4).
 AROPTIONS = ruv
 RANLIB = ranlib

-# RANLIB = echo # Uncomment this line for IRIX and Solaris

 
 # Compiler libraries: defaults to GCC libraries
 # Solaris: -lgen -ldl -lsocket -lnsl
 
 # Compiler libraries: defaults to GCC libraries
 # Solaris: -lgen -ldl -lsocket -lnsl


@@ -149,31 +137,6 @@ RANLIB = ranlib
 #added for win95
 COMPPATHS=
 
 #added for win95
 COMPPATHS=
 

-# HP-specific compiler library: an AIAI convenience
-HPCOMPLIBS=
-
-# LDLIBS for specific GUIs
-
-# The following for LINUX and Motif 2.0:
-#MOTIFLDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXpm -lXt -lXext -lX11 -lm
-
-#BASICMOTIFLDLIBS = -lwx_motif /aiai/packages/motif1.2.1/motif/sun4/lib/libXm.a /aiai/packages/motif1.2.1/motif/sun4/lib/libXmu.a /aiai/packages/motif1.2.1/motif/sun4/lib/libXt.a /aiai/packages/motif1.2.1/motif/sun4/lib/libX11.a -lm
-# Apparently libg++ (in COMPLIBS) should go before libXm because of a clash of
-# function name: re_create.
-#BASICMOTIFLDLIBS = -lwx_motif $(COMPLIBS) -lXm -lXmu -lXt -lX11 -lm
-
-#MOTIFLDLIBS = $(BASICMOTIFLDLIBS) $(COMPLIBS)
-
-#XVIEWLDLIBS = -lwx_ol -lxview -lolgx -lX11 -lm $(COMPLIBS)
-#HPLDLIBS=-lwx_hp -lXm -lXmu -lXt -lX11 -lm
-#CYGNUSLDLIBS=
-# Default LDLIBS for XView (don't change this)
-#LDLIBS = $(CYGNUSLDLIBS)
-
-# _ol or _motif (don't need to change, the makefiles will take
-# care of it if you use motif/hp/xview targets)
-#GUISUFFIX=_ol
-

 ########################## Directories ###############################
 
 
 ########################## Directories ###############################
 
 


@@ -186,7 +149,7 @@ WXSRC=$(WXDIR)/src/msw
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
 WXINC=$(WXDIR)/include
 WXBASESRC=$(WXDIR)/src/common
 WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)

-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC)$(COMPPATHS)

 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
 RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)\include"
 
 #LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)


@@ -207,9 +170,6 @@ CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEB
 CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT)
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 
 CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT)
 LDFLAGS =  -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib
 

-# Extra patch link for XView
-#XVIEW_LINK = $(WXDIR)/src/x/objects_ol/sb_scrol.o # $(WXDIR)/src/x/objects_ol/xvwinlp.o
-

 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
 # Set these in a batch file instead e.g. install/cygnus.bat
 .SUFFIXES: .rc .$(RESSUFF) .$(RSCSUFF) .cpp .c
 
 # Set these in a batch file instead e.g. install/cygnus.bat

diff --git a/src/makemsc.env b/src/makemsc.env
index d30e9badd217af8af611adb0e265715dec72f48e..e12f7b692b0b4e742d7aebd95a6484666e0dc4cf 100644 (file)
--- a/src/makemsc.env
+++ b/src/makemsc.env
@@ -56,15 +56,15 @@ LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem $(
 !if "$(DLL)" == "0"
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)
 !if "$(DLL)" == "0"
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)

-CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__
+CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ /D__WINDOWS__ $(PRECOMP)
+CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WXMSW__ /D__WINDOWS__

 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummy
 !else
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)
 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummy
 !else
 PCH=WX.PCH
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH)

-CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__
+CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ /D__WINDOWS__$(PRECOMP)
+CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WXMSW__ /D__WINDOWS__

 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummydll
 !endif
 LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
 DUMMY=dummydll
 !endif

diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index f89afb5f733f52b98cdf7a45e5b1e39bbb24700e..2380393bfd4e94dff12297a1cd35f3f4a4bfdf5f 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -53,7 +53,7 @@
 #endif
 
 // use debug CRT functions for memory leak detections in VC++
 #endif
 
 // use debug CRT functions for memory leak detections in VC++

-/* THIS CRAPS OUT in VC++ 5.
+/* Doesn't work when using the makefiles, for some reason.

 #if defined(__WXDEBUG__) && defined(_MSC_VER)
   #include <crtdbg.h>
 #endif
 #if defined(__WXDEBUG__) && defined(_MSC_VER)
   #include <crtdbg.h>
 #endif


@@ -423,8 +423,7 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_
 {
   wxhInstance = (HINSTANCE) hInstance;
 
 {
   wxhInstance = (HINSTANCE) hInstance;
 

-/* No, sorry, whatever this is, forget it. Doesn't work with VC++ 5.
-
+/* Doesn't work when using the makefiles, for some reason.

   #if defined(__WXDEBUG__) && defined(_MSC_VER)
     // do check for memory leaks on program exit
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
   #if defined(__WXDEBUG__) && defined(_MSC_VER)
     // do check for memory leaks on program exit
     // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index f34b25550731bb52e41ae0d5a55bea59388ddbeb..bd81c9362d694f3c63efb14157c5cd9195e12e44 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -386,7 +386,7 @@ void wxDC::DrawLine(long x1, long y1, long x2, long y2)
   CalcBoundingBox(x2, y2);
 }
 
   CalcBoundingBox(x2, y2);
 }
 

-void wxDC::DrawArc(long x1,long y1,long x2,long y2,double xc,double yc)
+void wxDC::DrawArc(long x1,long y1,long x2,long y2, long xc, long yc)

 {
   double dx = xc-x1 ;
   double dy = yc-y1 ;
 {
   double dx = xc-x1 ;
   double dy = yc-y1 ;

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index b44de26681a8dac9090cb7ab7973f680ca98f806..9e09253b3f27102133b270d2b9feeeb2806192cd 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -576,11 +576,12 @@ $(CFG): makefile.b32
 -WE
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib
 -WE
 
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/png;$(WXDIR)/src/zlib

--I$(WXDIR)\include\msw\gnuwin32
+-I$(WXDIR)\include\wx\msw\gnuwin32

 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -D__WXMSW__
 
 -L$(BCCDIR)\lib
 -D__WXWIN__
 -D__WXMSW__

+-D__WINDOWS__

 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)
 -DWIN32
 $(OPT)
 $(DEBUG_FLAGS)

diff --git a/src/msw/makefile.nt b/src/msw/makefile.nt
index 695ae309cd6cd89e94bff33a88afc5a908a515ee..f95967bf11fa806d21a45ca8bcb477d8942ecec6 100644 (file)
--- a/src/msw/makefile.nt
+++ b/src/msw/makefile.nt
@@ -92,8 +92,8 @@ COMMONOBJS = \
   $(COMMDIR)\log.obj \
   $(COMMDIR)\memory.obj \
   $(COMMDIR)\module.obj \
   $(COMMDIR)\log.obj \
   $(COMMDIR)\memory.obj \
   $(COMMDIR)\module.obj \

-  $(COMMDIR)\object.obj \

   $(COMMDIR)\odbc.obj \
   $(COMMDIR)\odbc.obj \

+  $(COMMDIR)\object.obj \

   $(COMMDIR)\postscrp.obj \
   $(COMMDIR)\prntbase.obj \
   $(COMMDIR)\resource.obj \
   $(COMMDIR)\postscrp.obj \
   $(COMMDIR)\prntbase.obj \
   $(COMMDIR)\resource.obj \


@@ -120,7 +120,6 @@ COMMONOBJS = \
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\wincmn.obj
 
   $(COMMDIR)\datstrm.obj \
   $(COMMDIR)\wincmn.obj
 

-

 MSWOBJS = \
   $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \
 MSWOBJS = \
   $(MSWDIR)\accel.obj \
   $(MSWDIR)\app.obj \

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 15694984793a1d8807059f1e6450e36ca2acd2e4..490d7d03273b887bbc3c55a6de9949238c4400b0 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2061,7 +2061,7 @@ void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos))
 }
 
 // Deal with child commands from buttons etc.
 }
 
 // Deal with child commands from buttons etc.

-bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
+bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control)

 {
 #if WXDEBUG > 1
   wxDebugMsg("wxWindow::MSWOnCommand\n");
 {
 #if WXDEBUG > 1
   wxDebugMsg("wxWindow::MSWOnCommand\n");


@@ -2093,27 +2093,11 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control))
   }
   else
   {
   }
   else
   {

-#if WXDEBUG > 1
-    wxDebugMsg("Could not find item!\n");
-    char buf[100];
-    wxDebugMsg("Item ids for this panel:\n");
-
-    wxNode *current = GetChildren()->First();
-    while (current)
-    {
-      wxObject *obj = (wxObject *)current->Data() ;
-      if (obj->IsKindOf(CLASSINFO(wxControl)))
-      {
-        wxControl *item = (wxControl *)current->Data();
-        sprintf(buf, "  %d\n", (int)item->m_windowId);
-        wxDebugMsg(buf);
-      }
-      current = current->Next();  
-    }
-    wxYield();
-#endif
-    return FALSE;
+    wxWindow *win = wxFindWinFromHandle(control);
+    if (win)
+      return win->MSWCommand(cmd, id);

   }
   }

+  return FALSE;

 }
 
 long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam)
 }
 
 long wxWindow::MSWOnSysCommand(WXWPARAM wParam, WXLPARAM lParam)

diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index dad8b1a29118c616bf291018a33cc5a9bddc7563..39bc88294f92b5353ae5eb57d1446c61a3aa20f2 100644 (file)
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -145,9 +145,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 
 MAKEPRECOMP=/YcWX/WXPREC.H
 !endif
 

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /GX /D__WXDEBUG__ /DWXDEBUG=1 /DSTRICT
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) /D__WINDOWS__ /GX /D__WXDEBUG__ /DWXDEBUG=1 /DSTRICT

 # If you don't include wxprec.h, use CPPFLAGS2
 # If you don't include wxprec.h, use CPPFLAGS2

-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /GX /D__WXDEBUG__ /DWXDEBUG=1 /DSTRICT
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /D__WXDEBUG__ /DWXDEBUG=1 /DSTRICT

 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy
 
 LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
 DUMMY=dummy
 


@@ -162,8 +162,8 @@ DUMMY=dummy
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
 !endif
 
 PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb

-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL

 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 
 LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
 !endif
 

diff --git a/src/stubs/accel.cpp b/src/stubs/accel.cpp
index 707ba496ffc769ef1b22793a8ae6efe22e19aac3..b0b8734d55b0d9702e88b40033d0e8bdb876d48b 100644 (file)
--- a/src/stubs/accel.cpp
+++ b/src/stubs/accel.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/setup.h"
 #include "wx/accel.h"
 
 #include "wx/setup.h"
 #include "wx/accel.h"

+#include "wx/string.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

diff --git a/src/stubs/app.cpp b/src/stubs/app.cpp
index f54a6806e2e803415eefd05ee04a2e37b52a0f67..d879be671267196783a3333f91e08b6112c1cb1e 100644 (file)
--- a/src/stubs/app.cpp
+++ b/src/stubs/app.cpp
@@ -27,14 +27,18 @@
 #include "wx/msgdlg.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/msgdlg.h"
 #include "wx/log.h"
 #include "wx/module.h"

+#include "wx/memory.h"

 
 #if USE_WX_RESOURCES
 #include "wx/resource.h"
 #endif
 
 
 #if USE_WX_RESOURCES
 #include "wx/resource.h"
 #endif
 

+#if USE_POSTSCRIPT
+#include "wx/postscrp.h"
+#endif
+

 #include <string.h>
 
 #include <string.h>
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)

 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 extern char *wxBuffer;
 extern wxList wxPendingDelete;
 


@@ -145,7 +149,7 @@ int wxEntry( int argc, char *argv[] )
       return 0;
     };
     
       return 0;
     };
     

-       wxTheApp = (* wxApp::GetInitializerFunction()) ();
+       wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();

   };
   
   if (!wxTheApp) 
   };
   
   if (!wxTheApp) 


@@ -170,8 +174,6 @@ int wxEntry( int argc, char *argv[] )
   
   if (!wxTheApp->OnInit()) return 0;
 
   
   if (!wxTheApp->OnInit()) return 0;
 

-  wxTheApp->m_initialized = (wxTopLevelWindows.Number() > 0);
-  

   int retValue = 0;
   
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
   int retValue = 0;
   
   if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();

diff --git a/src/stubs/checklst.cpp b/src/stubs/checklst.cpp
index c7121e553da6129fecfc2721fdf1f9ce5db138a2..ecabf5408ec88e1889148ad9db7fd8210e8fc5db 100644 (file)
--- a/src/stubs/checklst.cpp
+++ b/src/stubs/checklst.cpp
@@ -34,8 +34,6 @@
 // define event table
 // ------------------
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)
 // define event table
 // ------------------
 BEGIN_EVENT_TABLE(wxCheckListBox, wxListBox)

-  EVT_CHAR(wxCheckListBox::OnChar)
-  EVT_LEFT_DOWN(wxCheckListBox::OnLeftClick)

 END_EVENT_TABLE()
 
 // control creation
 END_EVENT_TABLE()
 
 // control creation


@@ -71,7 +69,6 @@ bool wxCheckListBox::IsChecked(uint uiIndex) const
 void wxCheckListBox::Check(uint uiIndex, bool bCheck)
 {
     // TODO
 void wxCheckListBox::Check(uint uiIndex, bool bCheck)
 {
     // TODO

-    return FALSE;

 }
 
 
 }
 
 

diff --git a/src/stubs/colordlg.cpp b/src/stubs/colordlg.cpp
index 9e970859aa73344e449b00d7f06d899f3dc88178..2275a9a39d679502d0a4c20e4d09c29009dc9445 100644 (file)
--- a/src/stubs/colordlg.cpp
+++ b/src/stubs/colordlg.cpp
@@ -1,6 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colordlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        colordlg.cpp

-// Purpose:     wxColourDialog class
+// Purpose:     wxColourDialog class. NOTE: you can use the generic class
+//              if you wish, instead of implementing this.

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -13,7 +14,7 @@
 #pragma implementation "colordlg.h"
 #endif
 
 #pragma implementation "colordlg.h"
 #endif
 

-#include "wx/colordlg.h"
+#include "wx/stubs/colordlg.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)

diff --git a/src/stubs/control.cpp b/src/stubs/control.cpp
index 651b272953bcb846674bff1b6d9e7d92edbdcff8..b141a80ff1c9bc933cc4af9101ff80adb24cb527 100644 (file)
--- a/src/stubs/control.cpp
+++ b/src/stubs/control.cpp
@@ -37,7 +37,7 @@ wxControl::~wxControl()
     wxWindow *parent = (wxWindow *)GetParent();
     if (parent)
     {
     wxWindow *parent = (wxWindow *)GetParent();
     if (parent)
     {

-        if (parent->GetDefaultItem() == this)
+        if (parent->GetDefaultItem() == (wxButton*) this)

             parent->SetDefaultItem(NULL);
     }
 }
             parent->SetDefaultItem(NULL);
     }
 }


@@ -53,17 +53,6 @@ wxString wxControl::GetLabel() const
     return wxString("");
 }
 
     return wxString("");
 }
 

-/*
- * Allocates control IDs within the appropriate range
- */
-
-int NewControlId()
-{
-    static int s_controlId = 0;
-    s_controlId ++;
-    return s_controlId;
-}
-

 void wxControl::ProcessCommand (wxCommandEvent & event)
 {
   // Tries:
 void wxControl::ProcessCommand (wxCommandEvent & event)
 {
   // Tries:


@@ -80,11 +69,6 @@ void wxControl::ProcessCommand (wxCommandEvent & event)
     }
 }
 
     }
 }
 

-void wxControl::SetClientSize (int width, int height)
-{
-  SetSize (-1, -1, width, height);
-}
-

 void wxControl::Centre (int direction)
 {
   int x, y, width, height, panel_width, panel_height, new_x, new_y;
 void wxControl::Centre (int direction)
 {
   int x, y, width, height, panel_width, panel_height, new_x, new_y;

diff --git a/src/stubs/cursor.cpp b/src/stubs/cursor.cpp
index c856f5e9e0caf1242ef0970a59ed10c6c3dac1dc..f5cc609f7ec125ab82f4f74eea861b93db5a1872 100644 (file)
--- a/src/stubs/cursor.cpp
+++ b/src/stubs/cursor.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/cursor.h"
 #endif
 
 #include "wx/cursor.h"

+#include "wx/icon.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxCursor, wxBitmap)

diff --git a/src/stubs/data.cpp b/src/stubs/data.cpp
index d706f823348b7b4f124cd822f61921b378f963ff..ae2895408bc2179e97f6c5a82beafa451e21c95c 100644 (file)
--- a/src/stubs/data.cpp
+++ b/src/stubs/data.cpp
@@ -131,6 +131,7 @@ const char *wxDoubleToStringStr = "%.2f";
 wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
 #endif
 
 wxPrintPaperDatabase* wxThePrintPaperDatabase = NULL;
 #endif
 

+#if USE_SHARED_LIBRARY

 ///// Event tables (also must be in one, statically-linked file for shared libraries)
 
 // This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here
 ///// Event tables (also must be in one, statically-linked file for shared libraries)
 
 // This is the base, wxEvtHandler 'bootstrap' code which is expanded manually here


@@ -140,6 +141,7 @@ const wxEventTable wxEvtHandler::sm_eventTable =
        { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };
        { NULL, &wxEvtHandler::sm_eventTableEntries[0] };
 
 const wxEventTableEntry wxEvtHandler::sm_eventTableEntries[] = { { 0, 0, 0, NULL } };

+#endif

 
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);
 
 const wxSize wxDefaultSize(-1, -1);
 const wxPoint wxDefaultPosition(-1, -1);

diff --git a/src/stubs/dc.cpp b/src/stubs/dc.cpp
index 4cfe7305cc064d5075db6648e26af22e27b31ef3..466c670c91d4ecd170bfecb4e77d55aea00ccecd 100644 (file)
--- a/src/stubs/dc.cpp
+++ b/src/stubs/dc.cpp
@@ -34,8 +34,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 // wxDC
 //-----------------------------------------------------------------------------
 
 // wxDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDC,wxObject)
-

 wxDC::wxDC(void)
 {
   m_ok = FALSE;
 wxDC::wxDC(void)
 {
   m_ok = FALSE;

diff --git a/src/stubs/dcclient.cpp b/src/stubs/dcclient.cpp
index e25920d94fea3062557688b3f5dd911a6aa15854..53a84e692805bacb758b493153bf69fb8342bd8f 100644 (file)
--- a/src/stubs/dcclient.cpp
+++ b/src/stubs/dcclient.cpp
@@ -47,7 +47,7 @@ wxPaintDC::~wxPaintDC(void)
 };
 
 void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 
 };
 
 void wxPaintDC::FloodFill( long WXUNUSED(x1), long WXUNUSED(y1), 

-  wxColour *WXUNUSED(col), int WXUNUSED(style) )
+  wxColour* WXUNUSED(col), int WXUNUSED(style) )

 {
 };
 
 {
 };
 


@@ -68,7 +68,7 @@ void wxPaintDC::CrossHair( long x, long y )
   
 };
 
   
 };
 

-void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, double xc, double yc )
+void wxPaintDC::DrawArc( long x1, long y1, long x2, long y2, long xc, long yc )

 {
   if (!Ok()) return;
   
 {
   if (!Ok()) return;
   


@@ -347,13 +347,13 @@ void wxPaintDC::GetTextExtent( const wxString &string, long *width, long *height
 long wxPaintDC::GetCharWidth(void)
 {
   if (!Ok()) return 0;
 long wxPaintDC::GetCharWidth(void)
 {
   if (!Ok()) return 0;

-  
+  return 0;

 };
 
 long wxPaintDC::GetCharHeight(void)
 {
   if (!Ok()) return 0;
 };
 
 long wxPaintDC::GetCharHeight(void)
 {
   if (!Ok()) return 0;

-  
+  return 0;

 };
 
 void wxPaintDC::Clear(void)
 };
 
 void wxPaintDC::Clear(void)

diff --git a/src/stubs/dcmemory.cpp b/src/stubs/dcmemory.cpp
index c6066bb1abda33d50c34545a669ad9de5865c3c9..7cbd330821f76b4c97a124689b631d859e829e03 100644 (file)
--- a/src/stubs/dcmemory.cpp
+++ b/src/stubs/dcmemory.cpp
@@ -15,10 +15,6 @@
 
 #include "wx/dcmemory.h"
 
 
 #include "wx/dcmemory.h"
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
-#endif
-

 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxMemoryDC
 //-----------------------------------------------------------------------------

diff --git a/src/stubs/dialog.cpp b/src/stubs/dialog.cpp
index 9b72fb0f6952560a2ac85697b6c37560d8025e99..c278536c606e3baf6fe272be8f5f65b9b8d324e4 100644 (file)
--- a/src/stubs/dialog.cpp
+++ b/src/stubs/dialog.cpp
@@ -107,10 +107,8 @@ wxDialog::~wxDialog()
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {
 // By default, pressing escape cancels the dialog
 void wxDialog::OnCharHook(wxKeyEvent& event)
 {

-  if (GetHWND())
+  if (event.m_keyCode == WXK_ESCAPE)

   {
   {

-    if (event.m_keyCode == WXK_ESCAPE)
-    {

                // Behaviour changed in 2.0: we'll send a Cancel message
                // to the dialog instead of Close.
                wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
                // Behaviour changed in 2.0: we'll send a Cancel message
                // to the dialog instead of Close.
                wxCommandEvent cancelEvent(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);


@@ -118,7 +116,6 @@ void wxDialog::OnCharHook(wxKeyEvent& event)
                GetEventHandler()->ProcessEvent(cancelEvent);
 
                return;
                GetEventHandler()->ProcessEvent(cancelEvent);
 
                return;

-    }

   }
   // We didn't process this event.
   event.Skip();
   }
   // We didn't process this event.
   event.Skip();

diff --git a/src/stubs/dirdlg.cpp b/src/stubs/dirdlg.cpp
index 7fe15310ee0e629f379d71b8abf907e1dc621e01..095621b978ebe12a862622298ae8d5f1f48db38d 100644 (file)
--- a/src/stubs/dirdlg.cpp
+++ b/src/stubs/dirdlg.cpp
@@ -17,7 +17,6 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/dirdlg.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/dirdlg.h"

-#endif

 
 #include "wx/cmndata.h"
 
 
 #include "wx/cmndata.h"
 

diff --git a/src/stubs/filedlg.cpp b/src/stubs/filedlg.cpp
index cf096037d662701646471c6e179c33a7ea308009..2aeffdf926776a60104fba72807157738c254091 100644 (file)
--- a/src/stubs/filedlg.cpp
+++ b/src/stubs/filedlg.cpp
@@ -17,6 +17,7 @@
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"
 #include "wx/filedlg.h"

+#include "wx/intl.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxFileDialog, wxDialog)


@@ -100,7 +101,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 int wxFileDialog::ShowModal()
 {
     // TODO
 int wxFileDialog::ShowModal()
 {
     // TODO

-    wxID_CANCEL;
+    return wxID_CANCEL;

 }
 
 // Generic file load/save dialog
 }
 
 // Generic file load/save dialog

diff --git a/src/stubs/font.cpp b/src/stubs/font.cpp
index 5835259696b8a0e40d5d3b37d0b1fb2a2d1cb1f0..493a6a25baf3dbd7c84cbf073f857397f7e6b494 100644 (file)
--- a/src/stubs/font.cpp
+++ b/src/stubs/font.cpp
@@ -13,7 +13,10 @@
 #pragma implementation "font.h"
 #endif
 
 #pragma implementation "font.h"
 #endif
 

+#include "wx/defs.h"
+#include "wx/string.h"

 #include "wx/font.h"
 #include "wx/font.h"

+#include "wx/gdicmn.h"

 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)
 
 #if !USE_SHARED_LIBRARIES
 IMPLEMENT_DYNAMIC_CLASS(wxFont, wxGDIObject)

diff --git a/src/stubs/fontdlg.cpp b/src/stubs/fontdlg.cpp
index 4bfa59eac439505ea5cbb9c93c664fcec0fbfff3..60e8e9b987958d84ca818de0d767cad90438f9c3 100644 (file)
--- a/src/stubs/fontdlg.cpp
+++ b/src/stubs/fontdlg.cpp
@@ -1,6 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        fontdlg.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        fontdlg.cpp

-// Purpose:     wxFontDialog class
+// Purpose:     wxFontDialog class. NOTE: you can use the generic class
+//              if you wish, instead of implementing this.

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -13,7 +14,7 @@
 #pragma implementation "fontdlg.h"
 #endif
 
 #pragma implementation "fontdlg.h"
 #endif
 

-#include "wx/fontdlg.h"
+#include "wx/stubs/fontdlg.h"

 #include "wx/cmndata.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/cmndata.h"
 
 #if !USE_SHARED_LIBRARY

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index 3d9b5b0004e91e379159f529fd7de353be1eb852..5c22818c61d738b784c988834330f0cf7864347c 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -17,6 +17,11 @@
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"
 #include "wx/statusbr.h"
 #include "wx/toolbar.h"
 #include "wx/menuitem.h"

+#include "wx/menu.h"
+#include "wx/dcclient.h"
+#include "wx/dialog.h"
+#include "wx/settings.h"
+#include "wx/app.h"

 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;
 
 extern wxList wxModelessWindows;
 extern wxList wxPendingDelete;


@@ -512,9 +517,6 @@ void wxFrame::PositionToolBar()
     // the toolbar/status bar were added.
     // So DEFINITELY replace the line below with something appropriate.
 
     // the toolbar/status bar were added.
     // So DEFINITELY replace the line below with something appropriate.
 

-    wxCHECK_MSG( TRUE, FALSE,
-               "PositionToolBar not implemented properly, see frame.cpp" );
-

     GetClientSize(& cw, &ch);
 
     if ( GetStatusBar() )
     GetClientSize(& cw, &ch);
 
     if ( GetStatusBar() )

diff --git a/src/stubs/gauge.cpp b/src/stubs/gauge.cpp
index 8e11c5001b1257ae253d8320a10eafc8613a5556..a85fbc498ffacbc22cc601acc40b6835be0ffb0a 100644 (file)
--- a/src/stubs/gauge.cpp
+++ b/src/stubs/gauge.cpp
@@ -93,13 +93,3 @@ int wxGauge::GetValue() const
     return m_gaugePos;
 }
 
     return m_gaugePos;
 }
 

-void wxGauge::SetForegroundColour(const wxColour& col)
-{
-    m_foregroundColour = col ;
-}
-
-void wxGauge::SetBackgroundColour(const wxColour& col)
-{
-    m_backgroundColour = col ;
-}
-

diff --git a/src/stubs/imaglist.cpp b/src/stubs/imaglist.cpp
index 7c18d9f46414cc7eb12e38cbbf5be04a24d81660..4cb47b4e693ba6a9a223ded7a417fd4336e80087 100644 (file)
--- a/src/stubs/imaglist.cpp
+++ b/src/stubs/imaglist.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaglist.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        imaglist.cpp

-// Purpose:     wxImageList
+// Purpose:     wxImageList. You may wish to use the generic version.

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -13,7 +13,7 @@
 #pragma implementation "imaglist.h"
 #endif
 
 #pragma implementation "imaglist.h"
 #endif
 

-#include "wx/msw/imaglist.h"
+#include "wx/stubs/imaglist.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxImageList, wxObject)

diff --git a/src/stubs/listbox.cpp b/src/stubs/listbox.cpp
index a54523ab3d4f48ce33b4ad03b3ab2695f6ac9603..1dad21e12c4167ff042aa439ebb08261f70c4caf 100644 (file)
--- a/src/stubs/listbox.cpp
+++ b/src/stubs/listbox.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #include "wx/listbox.h"
 #endif
 
 #include "wx/listbox.h"

-
+#include "wx/settings.h"

 #include "wx/dynarray.h"
 #include "wx/log.h"
 
 #include "wx/dynarray.h"
 #include "wx/log.h"
 


@@ -63,11 +63,6 @@ wxListBox::~wxListBox()
 {
 }
 
 {
 }
 

-void wxListBox::SetupColours()
-{
-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
-}
-

 void wxListBox::SetFirstItem(int N)
 {
     // TODO
 void wxListBox::SetFirstItem(int N)
 {
     // TODO

diff --git a/src/stubs/listctrl.cpp b/src/stubs/listctrl.cpp
index a659399c6364614d90a2ccd00d659bf3b339a24c..0f4ed673a59063659b382a2de53308f2d3b3c57e 100644 (file)
--- a/src/stubs/listctrl.cpp
+++ b/src/stubs/listctrl.cpp
@@ -13,7 +13,8 @@
 #pragma implementation "listctrl.h"
 #endif
 
 #pragma implementation "listctrl.h"
 #endif
 

-#include "wx/listctrl.h"
+#include "wx/stubs/textctrl.h"
+#include "wx/stubs/listctrl.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxListCtrl, wxControl)


@@ -365,17 +366,14 @@ void wxListCtrl::SetImageList(wxImageList *imageList, int which)
        int flags = 0;
        if ( which == wxIMAGE_LIST_NORMAL )
     {
        int flags = 0;
        if ( which == wxIMAGE_LIST_NORMAL )
     {

-               flags = LVSIL_NORMAL;

                m_imageListNormal = imageList;
        }
        else if ( which == wxIMAGE_LIST_SMALL )
     {
                m_imageListNormal = imageList;
        }
        else if ( which == wxIMAGE_LIST_SMALL )
     {

-               flags = LVSIL_SMALL;

                m_imageListSmall = imageList;
        }
        else if ( which == wxIMAGE_LIST_STATE )
     {
                m_imageListSmall = imageList;
        }
        else if ( which == wxIMAGE_LIST_STATE )
     {

-               flags = LVSIL_STATE;

                m_imageListState = imageList;
        }
        // TODO set image list
                m_imageListState = imageList;
        }
        // TODO set image list

diff --git a/src/stubs/main.cpp b/src/stubs/main.cpp
index d90dc2c036408488615d5fb22e0600ca285f7a1a..47a9924baed48ff0b5da535435366d6cc25ca8c4 100644 (file)
--- a/src/stubs/main.cpp
+++ b/src/stubs/main.cpp
@@ -13,6 +13,6 @@
 
 int main(int argc, char* argv[])
 {
 
 int main(int argc, char* argv[])
 {

-  return wxEntry(argc, argv[]);
+  return wxEntry(argc, argv);

 }
 
 }
 

diff --git a/src/stubs/makefile.nt b/src/stubs/makefile.nt
new file mode 100644 (file)
index 0000000..2865fbc
--- /dev/null
+++ b/src/stubs/makefile.nt
@@ -0,0 +1,955 @@
+#
+# File:                makefile.nt
+# Author:      Julian Smart
+# Created:     1997
+# Updated:
+# Copyright:   (c) 1997, Julian Smart
+#
+# "%W% %G%"
+#
+# Makefile : Builds wxWindows stubs library wxstubs.lib for VC++ (32-bit)
+# Arguments:
+#
+# FINAL=1 argument to nmake to build version with no debugging info.
+#
+
+!include <ntwin32.mak>
+
+APPVER=3.50 # 4.0
+# This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0).
+WINVERSION=-DWINVER=0x0400
+
+# On Alpha machines, change to CPU=ALPHA
+CPU=i386
+
+# Suffixes
+OBJSUFF=obj
+SRCSUFF=cpp
+
+WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 $(WINVERSION) -D__WIN32__ -D__WINDOWS__
+WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER)
+WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\
+ comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib # libci.lib # libci.lib required for VC++ 4.2
+
+# Change this to your WXWIN directory
+WXDIR=$(WXWIN)
+
+WXSRC=$(WXDIR)\src\stubs
+WXINC=$(WXDIR)\include
+WXBASESRC=$(WXDIR)\src\common
+
+WXLIB=$(WXDIR)\lib\wxstubs.lib
+
+EXTRADLLFLAGS=
+
+INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC)
+LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS)
+
+!ifndef FINAL
+FINAL=0
+DEBUG=1
+!endif
+
+# Set this to 1 if you don't want to use precompiled headers
+NOPCH=1
+
+OPTIONS=
+
+!if "$(FINAL)" == "0"
+OPT = /Od /Gy
+# ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated
+DEBUG_FLAGS= /Zi # /FR
+LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE
+CRTFLAG=/MD
+!else
+# /O1 - smallest code
+# /O2 - fastest code
+OPT = /O1 # /O2 # /Od
+DEBUG_FLAGS=
+LINK_DEBUG_FLAGS=/RELEASE
+CRTFLAG=/MD
+!endif
+
+PCH=
+PRECOMP=
+MAKEPRECOMP=
+
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXSTUBS__ /DDEBUG=1 $(INC) $(OPT) $(CRTFLAG) /GX /D__WXDEBUG__ /DWXDEBUG=1
+# If you don't include wxprec.h, use CPPFLAGS2
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXSTUBS__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(CRTFLAG) /GX /D__WXDEBUG__ /DWXDEBUG=1
+LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
+
+THISDIR=$(WXWIN)\src\stubs
+
+LIBTARGET=$(WXLIB)
+
+# Please set these according to the settings in wx_setup.h, so we can include
+# the appropriate libraries in wx.lib
+
+PERIPH_LIBS=
+PERIPH_TARGET=
+PERIPH_CLEAN_TARGET=
+
+GENDIR=..\generic
+COMMDIR=..\common
+STUBSDIR=.
+
+DOCDIR = $(WXDIR)\docs
+
+GENERICOBJS= \
+  $(GENDIR)\choicdgg.obj \
+  $(GENDIR)\colrdlgg.obj \
+  $(GENDIR)\fontdlgg.obj \
+  $(GENDIR)\gridg.obj \
+  $(GENDIR)\msgdlgg.obj \
+  $(GENDIR)\panelg.obj \
+  $(GENDIR)\printps.obj \
+  $(GENDIR)\prntdlgg.obj \
+  $(GENDIR)\scrolwin.obj \
+  $(GENDIR)\splitter.obj \
+  $(GENDIR)\statusbr.obj \
+  $(GENDIR)\tabg.obj \
+  $(GENDIR)\textdlgg.obj
+
+#  $(GENDIR)\helpxlp.obj \
+
+COMMONOBJS = \
+  $(COMMDIR)\cmndata.obj \
+  $(COMMDIR)\config.obj \
+  $(COMMDIR)\docview.obj \
+  $(COMMDIR)\docmdi.obj \
+  $(COMMDIR)\dynarray.obj \
+  $(COMMDIR)\event.obj \
+  $(COMMDIR)\file.obj \
+  $(COMMDIR)\filefn.obj \
+  $(COMMDIR)\fileconf.obj \
+  $(COMMDIR)\framecmn.obj \
+  $(COMMDIR)\gdicmn.obj \
+  $(COMMDIR)\intl.obj \
+  $(COMMDIR)\ipcbase.obj \
+  $(COMMDIR)\helpbase.obj \
+  $(COMMDIR)\layout.obj \
+  $(COMMDIR)\log.obj \
+  $(COMMDIR)\memory.obj \
+  $(COMMDIR)\module.obj \
+  $(COMMDIR)\object.obj \
+  $(COMMDIR)\postscrp.obj \
+  $(COMMDIR)\prntbase.obj \
+  $(COMMDIR)\resource.obj \
+  $(COMMDIR)\tbarbase.obj \
+  $(COMMDIR)\tbarsmpl.obj \
+  $(COMMDIR)\textfile.obj \
+  $(COMMDIR)\timercmn.obj \
+  $(COMMDIR)\utilscmn.obj \
+  $(COMMDIR)\validate.obj \
+  $(COMMDIR)\valtext.obj \
+  $(COMMDIR)\date.obj \
+  $(COMMDIR)\hash.obj \
+  $(COMMDIR)\list.obj \
+  $(COMMDIR)\string.obj \
+  $(COMMDIR)\time.obj \
+  $(COMMDIR)\wxexpr.obj \
+  $(COMMDIR)\y_tab.obj \
+  $(COMMDIR)\extended.obj \
+  $(COMMDIR)\process.obj \
+  $(COMMDIR)\fstream.obj \
+  $(COMMDIR)\mstream.obj \
+  $(COMMDIR)\zstream.obj \
+  $(COMMDIR)\stream.obj \
+  $(COMMDIR)\datstrm.obj \
+  $(COMMDIR)\wincmn.obj
+
+#  $(COMMDIR)\odbc.obj \
+
+STUBSOBJS = \
+  $(STUBSDIR)\accel.obj \
+  $(STUBSDIR)\app.obj \
+  $(STUBSDIR)\bitmap.obj \
+  $(STUBSDIR)\bmpbuttn.obj \
+  $(STUBSDIR)\brush.obj \
+  $(STUBSDIR)\button.obj \
+  $(STUBSDIR)\checkbox.obj \
+  $(STUBSDIR)\checklst.obj \
+  $(STUBSDIR)\choice.obj \
+  $(STUBSDIR)\clipbrd.obj \
+  $(STUBSDIR)\colordlg.obj \
+  $(STUBSDIR)\colour.obj \
+  $(STUBSDIR)\combobox.obj \
+  $(STUBSDIR)\control.obj \
+  $(STUBSDIR)\cursor.obj \
+  $(STUBSDIR)\data.obj \
+  $(STUBSDIR)\dc.obj \
+  $(STUBSDIR)\dcmemory.obj \
+  $(STUBSDIR)\dcclient.obj \
+  $(STUBSDIR)\dcscreen.obj \
+  $(STUBSDIR)\dialog.obj \
+  $(STUBSDIR)\dirdlg.obj \
+  $(STUBSDIR)\filedlg.obj \
+  $(STUBSDIR)\font.obj \
+  $(STUBSDIR)\fontdlg.obj \
+  $(STUBSDIR)\frame.obj \
+  $(STUBSDIR)\gauge.obj \
+  $(STUBSDIR)\gdiobj.obj \
+  $(STUBSDIR)\helpxxxx.obj \
+  $(STUBSDIR)\icon.obj \
+  $(STUBSDIR)\imaglist.obj \
+  $(STUBSDIR)\joystick.obj \
+  $(STUBSDIR)\listbox.obj \
+  $(STUBSDIR)\listctrl.obj \
+  $(STUBSDIR)\main.obj \
+  $(STUBSDIR)\mdi.obj \
+  $(STUBSDIR)\menu.obj \
+  $(STUBSDIR)\menuitem.obj \
+  $(STUBSDIR)\metafile.obj \
+  $(STUBSDIR)\minifram.obj \
+  $(STUBSDIR)\msgdlg.obj \
+  $(STUBSDIR)\notebook.obj \
+  $(STUBSDIR)\palette.obj \
+  $(STUBSDIR)\pen.obj \
+  $(STUBSDIR)\printdlg.obj \
+  $(STUBSDIR)\print.obj \
+  $(STUBSDIR)\radiobox.obj \
+  $(STUBSDIR)\radiobut.obj \
+  $(STUBSDIR)\region.obj \
+  $(STUBSDIR)\scrolbar.obj \
+  $(STUBSDIR)\settings.obj \
+  $(STUBSDIR)\slider.obj \
+  $(STUBSDIR)\spinbutt.obj \
+  $(STUBSDIR)\statbmp.obj \
+  $(STUBSDIR)\statbox.obj \
+  $(STUBSDIR)\statusbr.obj \
+  $(STUBSDIR)\stattext.obj \
+  $(STUBSDIR)\tabctrl.obj \
+  $(STUBSDIR)\taskbar.obj \
+  $(STUBSDIR)\toolbar.obj \
+  $(STUBSDIR)\textctrl.obj \
+  $(STUBSDIR)\thread.obj \
+  $(STUBSDIR)\timer.obj \
+  $(STUBSDIR)\treectrl.obj \
+  $(STUBSDIR)\utils.obj \
+  $(STUBSDIR)\utilsexc.obj \
+  $(STUBSDIR)\wave.obj \
+  $(STUBSDIR)\window.obj
+
+
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(STUBSOBJS)
+
+# Normal, static library
+all:    $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+
+$(WXDIR)\lib\wxstubs.lib:      $(OBJECTS) $(PERIPH_LIBS)
+       -erase $(LIBTARGET)
+       $(implib) @<<
+-out:$@
+-machine:$(CPU)
+$(OBJECTS) $(PERIPH_LIBS)
+<<
+
+########################################################
+# Windows-specific objects
+
+$(STUBSDIR)/accel.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/app.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/bitmap.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/bmpbuttn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/brush.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/button.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/choice.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/checkbox.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/checklst.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/clipbrd.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/colordlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/colour.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/combobox.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/control.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/cursor.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/data.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dc.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dcmemory.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dcclient.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dcprint.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dcscreen.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dialog.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/dirdlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/filedlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/font.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/fontdlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/frame.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/gauge.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/gdiobj.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/icon.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/imaglist.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/joystick.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/listbox.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(STUBSDIR)/listctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
+$(STUBSDIR)/main.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/mdi.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/menu.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/menuitem.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/metafile.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/minifram.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/msgdlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/notebook.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/palette.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/pen.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/printdlg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/print.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/radiobox.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/radiobut.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/region.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/scrolbar.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/settings.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/slider.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/spinbutt.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/statbmp.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/statbox.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/statusbr.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/stattext.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/tabctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/taskbar.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/toolbar.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/textctrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/thread.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/timer.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/treectrl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/utils.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/utilsexc.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/wave.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(STUBSDIR)/window.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+########################################################
+# Common objects (always compiled)
+
+$(COMMDIR)/cmndata.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/config.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/db.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/dbtable.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/docview.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/docmdi.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/dynarray.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/event.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/file.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/fileconf.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/filefn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/framecmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/gdicmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/intl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/ipcbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/helpbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/layout.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/log.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/memory.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/module.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/object.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/odbc.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/postscrp.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/prntbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/resource.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/tbarbase.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/tbarsmpl.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/textfile.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/timercmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/utilscmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/validate.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/valtext.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/date.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/wxexpr.obj:     $*.$(SRCSUFF)
+        echo $(CPPFLAGS)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/hash.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/list.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/string.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/matrix.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+#$(COMMDIR)/wxstrgnu/wxstrgnu.obj:     $*.$(SRCSUFF)
+#        cl @<<
+#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+#<<
+
+#$(COMMDIR)/wxstrgnu/wxregex.obj:     $*.$(SRCSUFF)
+#        cl @<<
+#$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+#<<
+
+$(COMMDIR)/time.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)\stream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)\fstream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)\mstream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)\zstream.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)\datstrm.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/extended.obj:     $*.c
+        cl @<<
+$(CPPFLAGS2) /c /Tp $*.c /Fo$@
+<<
+
+$(COMMDIR)/process.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/wincmn.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS2) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
+        cl @<<
+$(CPPFLAGS2) /c $*.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
+<<
+
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
+        copy $(COMMDIR)\dosyacc.c $(COMMDIR)\y_tab.c
+
+$(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
+    copy $(COMMDIR)\doslex.c $(COMMDIR)\lex_yy.c
+
+########################################################
+# Generic objects (not always compiled, depending on
+# whether platforms have native implementations)
+
+$(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/colrdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/fontdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/gridg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/helpxlp.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/msgdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/panelg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/printps.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/prntdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/scrolwin.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/splitter.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/statusbr.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/tabg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(GENDIR)/textdlgg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF) /Fo$@
+<<
+
+$(OBJECTS):    $(WXDIR)/include/wx/stubs/setup.h
+
+clean: $(PERIPH_CLEAN_TARGET)
+        -erase *.obj
+        -erase $(LIBTARGET)
+        -erase $(WXDIR)\lib\*.pdb
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.pch
+        cd $(WXDIR)\src\stubs
+        cd $(GENDIR)
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.obj
+        cd $(WXDIR)\src\stubs
+        cd $(COMMDIR)
+        -erase *.pdb
+        -erase *.sbr
+        -erase *.obj
+        -erase y_tab.c
+        -erase lex_yy.c
+        cd $(WXDIR)\src\stubs
+
+cleanall: clean
+

diff --git a/src/stubs/mdi.cpp b/src/stubs/mdi.cpp
index bcd7785c0dbcdce0b0dbdcca2f8ec97e59d0b1aa..95e05263a0cc9530d9707a48aeb4753edbcb6679 100644 (file)
--- a/src/stubs/mdi.cpp
+++ b/src/stubs/mdi.cpp
@@ -14,6 +14,8 @@
 #endif
 
 #include "wx/mdi.h"
 #endif
 
 #include "wx/mdi.h"

+#include "wx/menu.h"
+#include "wx/settings.h"

 
 extern wxList wxModelessWindows;
 
 
 extern wxList wxModelessWindows;
 

diff --git a/src/stubs/menu.cpp b/src/stubs/menu.cpp
index 217e6c8b888b75e3f6ba539032c76e2ff9deaebd..78406135755005717f0e3b3540d0bd73b5f6d312 100644 (file)
--- a/src/stubs/menu.cpp
+++ b/src/stubs/menu.cpp
@@ -25,6 +25,7 @@
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"
 #include "wx/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"

+#include "wx/utils.h"

 
 // other standard headers
 // ----------------------
 
 // other standard headers
 // ----------------------


@@ -293,11 +294,12 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
     {
             processed = GetEventHandler()->ProcessEvent(event);
     }
     {
             processed = GetEventHandler()->ProcessEvent(event);
     }

-
+/* TODO

     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())
         processed = GetInvokingWindow()->ProcessEvent(event);
     // Try the window the menu was popped up from (and up
     // through the hierarchy)
     if ( !processed && GetInvokingWindow())
         processed = GetInvokingWindow()->ProcessEvent(event);

+*/

 }
 
 bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
 }
 
 bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)


@@ -318,7 +320,7 @@ wxMenuBar::wxMenuBar()
     // TODO
 }
 
     // TODO
 }
 

-wxMenuBar::wxMenuBar(int n, wxMenu *Mmnus[], const wxString titles[])
+wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[])

 {
     m_eventHandler = this;
     m_menuCount = n;
 {
     m_eventHandler = this;
     m_menuCount = n;


@@ -560,7 +562,7 @@ wxString wxMenuBar::GetHelpString (int Id) const
     for (i = 0; i < m_menuCount; i++)
     {
         if (m_menus[i]->FindItemForId (Id))
     for (i = 0; i < m_menuCount; i++)
     {
         if (m_menus[i]->FindItemForId (Id))

-            eturn wxString(m_menus[i]->GetHelpString (Id));
+            return wxString(m_menus[i]->GetHelpString (Id));

     }
     return wxString("");
 }
     }
     return wxString("");
 }

diff --git a/src/stubs/metafile.cpp b/src/stubs/metafile.cpp
index 67850103eea9fbd0737d7cfaf11f457f7325d0b4..251c8559709d676fecac856e361e92a18d72c00e 100644 (file)
--- a/src/stubs/metafile.cpp
+++ b/src/stubs/metafile.cpp
@@ -13,7 +13,10 @@
 #pragma implementation "metafile.h"
 #endif
 
 #pragma implementation "metafile.h"
 #endif
 

-#include "wx/metafile.h"
+#include "wx/object.h"
+#include "wx/string.h"
+#include "wx/dc.h"
+#include "wx/stubs/metafile.h"

 #include "wx/clipbrd.h"
 
 extern bool wxClipboardIsOpen;
 #include "wx/clipbrd.h"
 
 extern bool wxClipboardIsOpen;

diff --git a/src/stubs/msgdlg.cpp b/src/stubs/msgdlg.cpp
index 775ac8f06415ee18d97780f8b10682c349a62bb6..aeaa9bac7ab149bfaf2aa5432038d9bfa9c563d8 100644 (file)
--- a/src/stubs/msgdlg.cpp
+++ b/src/stubs/msgdlg.cpp
@@ -13,7 +13,7 @@
 #pragma implementation "msgdlg.h"
 #endif
 
 #pragma implementation "msgdlg.h"
 #endif
 

-#include "wx/msgdlg.h"
+#include "wx/stubs/msgdlg.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)

diff --git a/src/stubs/notebook.cpp b/src/stubs/notebook.cpp
index aecb879f4bf2a2c778d750c183db3d3ea9eaf2ad..cd85a27ad717989fabcf7d2dcda67f789866749f 100644 (file)
--- a/src/stubs/notebook.cpp
+++ b/src/stubs/notebook.cpp
@@ -97,10 +97,6 @@ bool wxNotebook::Create(wxWindow *parent,
 
     m_windowId = id == -1 ? NewControlId() : id;
 
 
     m_windowId = id == -1 ? NewControlId() : id;
 

-    // colors and font
-    m_backgroundColour = wxColour(GetSysColor(COLOR_BTNFACE));
-    m_foregroundColour = *wxBLACK ;
-

     // style
     m_windowStyle = style;
 
     // style
     m_windowStyle = style;
 


@@ -278,7 +274,7 @@ void wxNotebook::OnSize(wxSizeEvent& event)
     SetSelection(nSel);
 
     // fit the notebook page to the tab control's display area
     SetSelection(nSel);
 
     // fit the notebook page to the tab control's display area

-    int w, hl
+    int w, h;

     GetSize(&w, &h);
 
     uint nCount = m_aPages.Count();
     GetSize(&w, &h);
 
     uint nCount = m_aPages.Count();

diff --git a/src/stubs/palette.cpp b/src/stubs/palette.cpp
index 445b545f0c09bc388a90f28c5b4a1968c22f81dc..f8db96f8d0894b7970275f7565fed661a7516cea 100644 (file)
--- a/src/stubs/palette.cpp
+++ b/src/stubs/palette.cpp
@@ -47,15 +47,6 @@ wxPalette::~wxPalette()
 {
 }
 
 {
 }
 

-bool wxPalette::FreeResource(bool force)
-{
-       if ( M_PALETTEDATA && M_PALETTEDATA->m_hPalette)
-       {
-      DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette);
-       }
-       return TRUE;
-}
-

 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
   UnRef();
 bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue)
 {
   UnRef();

diff --git a/src/stubs/print.cpp b/src/stubs/print.cpp
index 2aba87f3d4d7a1c35933ceec702f05f51627a157..1939136855356fff1b8158d060f84cc1bd47d522 100644 (file)
--- a/src/stubs/print.cpp
+++ b/src/stubs/print.cpp
@@ -13,11 +13,12 @@
 #pragma implementation "print.h"
 #endif
 
 #pragma implementation "print.h"
 #endif
 

-#include "wx/print.h"
+#include "wx/stubs/print.h"
+#include "wx/stubs/printdlg.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxPrinter, wxPrinterBase)

-IMPLEMENT_CLASS(wxWindowsPrintPreview, wxPrintPreviewBase)
+IMPLEMENT_CLASS(wxPrintPreview, wxPrintPreviewBase)

 #endif
 
 /*
 #endif
 
 /*


@@ -56,17 +57,17 @@ bool wxPrinter::Setup(wxWindow *parent)
  * Print preview
  */
 
  * Print preview
  */
 

-wxWindowsPrintPreview::wxWindowsPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):
+wxPrintPreview::wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data):

   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 
   wxPrintPreviewBase(printout, printoutForPrinting, data)
 {
     DetermineScaling();
 }
 

-wxWindowsPrintPreview::~wxWindowsPrintPreview()
+wxPrintPreview::~wxPrintPreview()

 {
 }
 
 {
 }
 

-bool wxWindowsPrintPreview::Print(bool interactive)
+bool wxPrintPreview::Print(bool interactive)

 {
     if (!printPrintout)
         return FALSE;
 {
     if (!printPrintout)
         return FALSE;


@@ -74,7 +75,7 @@ bool wxWindowsPrintPreview::Print(bool interactive)
     return printer.Print(previewFrame, printPrintout, interactive);
 }
 
     return printer.Print(previewFrame, printPrintout, interactive);
 }
 

-void wxWindowsPrintPreview::DetermineScaling()
+void wxPrintPreview::DetermineScaling()

 {
     // TODO
 }
 {
     // TODO
 }

diff --git a/src/stubs/printdlg.cpp b/src/stubs/printdlg.cpp
index 4a78ae47e0419fac4de1cdf4dfb58103f8342346..eae3b95568777cc53ac4ed40f4e0f8b6a778cd09 100644 (file)
--- a/src/stubs/printdlg.cpp
+++ b/src/stubs/printdlg.cpp
@@ -13,7 +13,8 @@
 #pragma implementation "printdlg.h"
 #endif
 
 #pragma implementation "printdlg.h"
 #endif
 

-#include "wx/printdlg.h"
+#include "wx/object.h"
+#include "wx/stubs/printdlg.h"

 #include "wx/dcprint.h"
 
 // Use generic page setup dialog: use your own native one if one exists.
 #include "wx/dcprint.h"
 
 // Use generic page setup dialog: use your own native one if one exists.


@@ -27,12 +28,8 @@ IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
 wxPrintDialog::wxPrintDialog():
  wxDialog()
 {
 wxPrintDialog::wxPrintDialog():
  wxDialog()
 {

-    dialogParent = NULL;
-    printerDC = NULL;
-    destroyDC = TRUE;
-    deviceName = NULL;
-    driverName = NULL;
-    portName = NULL;
+    m_dialogParent = NULL;
+    m_printerDC = NULL;

 }
 
 wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data):
 }
 
 wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data):


@@ -43,26 +40,19 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data):
 
 bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
 {
 
 bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
 {

-    dialogParent = p;
-    printerDC = NULL;
-    destroyDC = TRUE;
-    deviceName = NULL;
-    driverName = NULL;
-    portName = NULL;
+    m_dialogParent = p;
+    m_printerDC = NULL;

 
     if ( data )
 
     if ( data )

-        printData = *data;
+        m_printData = *data;

 
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {
 
     return TRUE;
 }
 
 wxPrintDialog::~wxPrintDialog()
 {

-    if (destroyDC && printerDC)
-        delete printerDC;
-    if (deviceName) delete[] deviceName;
-    if (driverName) delete[] driverName;
-    if (portName) delete[] portName;
+    if (m_printerDC)
+        delete m_printerDC;

 }
 
 int wxPrintDialog::ShowModal()
 }
 
 int wxPrintDialog::ShowModal()


@@ -73,10 +63,11 @@ int wxPrintDialog::ShowModal()
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
 
 wxDC *wxPrintDialog::GetPrintDC()
 {

-  if (printerDC)
+  if (m_printerDC)

   {
   {

-    destroyDC = FALSE;
-    return printerDC;
+    wxDC* dc = m_printerDC;
+    m_printerDC = NULL;
+    return dc;

   }
   else
     return NULL;
   }
   else
     return NULL;

diff --git a/src/stubs/region.cpp b/src/stubs/region.cpp
index d03d8e802027250b9d813305f4505227f36c2f39..c71d4c605a45a15004c399c66b2a1577e4c6e716 100644 (file)
--- a/src/stubs/region.cpp
+++ b/src/stubs/region.cpp
@@ -12,17 +12,9 @@
 #pragma implementation "region.h"
 #endif
 
 #pragma implementation "region.h"
 #endif
 

-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#include "wx/msw/region.h"
+#include "wx/region.h"

 #include "wx/gdicmn.h"
 
 #include "wx/gdicmn.h"
 

-#include <windows.h>
-

 #if !USE_SHARED_LIBRARY
        IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
        IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 #if !USE_SHARED_LIBRARY
        IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
        IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)


@@ -47,8 +39,6 @@ public:
        {
         // TODO
        }
        {
         // TODO
        }

-
-       HRGN m_region;

 };
 
 
 };
 
 

diff --git a/src/stubs/scrolbar.cpp b/src/stubs/scrolbar.cpp
index 0058a14f53583ade1e186d2a0b3657bd787696bb..307cdefc136adefd37a569261bf1275902475c10 100644 (file)
--- a/src/stubs/scrolbar.cpp
+++ b/src/stubs/scrolbar.cpp
@@ -72,7 +72,7 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {
 
 void wxScrollBar::Command(wxCommandEvent& event)
 {

-    SetValue(event.m_commandInt);
+    SetPosition(event.m_commandInt);

     ProcessCommand(event);
 }
 
     ProcessCommand(event);
 }
 

diff --git a/src/stubs/settings.cpp b/src/stubs/settings.cpp
index 0450dbc8e48596be31469573796c18d99cadde2a..d831092aa42ddb7d0774c5efd7b5d3a59c38a64e 100644 (file)
--- a/src/stubs/settings.cpp
+++ b/src/stubs/settings.cpp
@@ -18,13 +18,13 @@
 wxColour wxSystemSettings::GetSystemColour(int index)
 {
     // TODO
 wxColour wxSystemSettings::GetSystemColour(int index)
 {
     // TODO

-       return col;
+       return wxColour();

 }
 
 wxFont wxSystemSettings::GetSystemFont(int index)
 {
     // TODO
 }
 
 wxFont wxSystemSettings::GetSystemFont(int index)
 {
     // TODO

-    return wxFont;
+    return wxFont();

 }
 
 // Get a system metric, e.g. scrollbar size
 }
 
 // Get a system metric, e.g. scrollbar size

diff --git a/src/stubs/slider.cpp b/src/stubs/slider.cpp
index 97c453b9894fe62901459016f006ce4f68e2ed10..0be5a60de7d523fd7ce00d6bdb09edabb1a40c21 100644 (file)
--- a/src/stubs/slider.cpp
+++ b/src/stubs/slider.cpp
@@ -13,7 +13,7 @@
 #pragma implementation "slider.h"
 #endif
 
 #pragma implementation "slider.h"
 #endif
 

-#include "wx/msw/slider.h"
+#include "wx/slider.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxSlider, wxControl)

diff --git a/src/stubs/stattext.cpp b/src/stubs/stattext.cpp
index 195882691686319af3ac32ab41087327a479eb40..a1275b8bdcee3f075aabcd32f198554edfc7bca0 100644 (file)
--- a/src/stubs/stattext.cpp
+++ b/src/stubs/stattext.cpp
@@ -13,19 +13,9 @@
 #pragma implementation "stattext.h"
 #endif
 
 #pragma implementation "stattext.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP

 #include "wx/app.h"
 #include "wx/app.h"

-#endif
-

 #include "wx/stattext.h"
 #include "wx/stattext.h"

-#include "wx/msw/private.h"
+

 #include <stdio.h>
 
 #if !USE_SHARED_LIBRARY
 #include <stdio.h>
 
 #if !USE_SHARED_LIBRARY


@@ -50,162 +40,21 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
   else
        m_windowId = id;
 
   else
        m_windowId = id;
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-

   m_windowStyle = style;
 
   m_windowStyle = style;
 

-  long msStyle = WS_CHILD|WS_VISIBLE;
-  if (m_windowStyle & wxALIGN_CENTRE)
-    msStyle |= SS_CENTER;
-  else if (m_windowStyle & wxALIGN_RIGHT)
-    msStyle |= SS_RIGHT;
-  else
-    msStyle |= SS_LEFT;
-
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if ((m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
-    msStyle |= WS_BORDER;
-
-  HWND static_item = CreateWindowEx(MakeExtendedStyle(m_windowStyle), "STATIC", (const char *)label,
-                         msStyle,
-                         0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                         wxGetInstance(), NULL);
-
-#if CTL3D
-/*
-  if (!(GetParent()->GetWindowStyleFlag() & wxUSER_COLOURS))
-    Ctl3dSubclassCtl(static_item);
-*/
-#endif
-
-  m_hWnd = (WXHWND)static_item;
-
-  SubclassWin((WXHWND)static_item);
-

   SetFont(* parent->GetFont());
   SetFont(* parent->GetFont());

-  SetSize(x, y, width, height);
-  return TRUE;
+
+  // TODO
+  return FALSE;

 }
 
 void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
 {
 }
 
 void wxStaticText::SetSize(int x, int y, int width, int height, int sizeFlags)
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
-
-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-  int actualWidth = width;
-  int actualHeight = height;
-
-  char buf[300];
-  int current_width;
-  int cyf;
-
-  ::GetWindowText((HWND) GetHWND(), buf, 300);
-  GetTextExtent(buf, &current_width, &cyf, NULL, NULL,GetFont());
-
-  int ww, hh;
-  GetSize(&ww, &hh);
-
-  // If we're prepared to use the existing width, then...
-  if (width == -1 && ((sizeFlags & wxSIZE_AUTO_WIDTH) != wxSIZE_AUTO_WIDTH))
-    actualWidth = ww;
-  else if (width == -1)
-  {
-    int cx;
-    int cy;
-    wxGetCharSize(GetHWND(), &cx, &cy,GetFont());
-    actualWidth = (int)(current_width + cx) ;
-  }
-
-  // If we're prepared to use the existing height, then...
-  if (height == -1 && ((sizeFlags & wxSIZE_AUTO_HEIGHT) != wxSIZE_AUTO_HEIGHT))
-    actualHeight = hh;
-  else if (height == -1)
-  {
-    actualHeight = (int)(cyf) ;
-  }
-
-  MoveWindow((HWND) GetHWND(), x1, y1, actualWidth, actualHeight, TRUE);
+    // TODO

 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {
 }
 
 void wxStaticText::SetLabel(const wxString& label)
 {

-  int w, h;
-  RECT rect;
-
-  wxWindow *parent = GetParent();
-  GetWindowRect((HWND) GetHWND(), &rect);
-
-  // Since we now have the absolute screen coords,
-  // if there's a parent we must subtract its top left corner
-  POINT point;
-  point.x = rect.left;
-  point.y = rect.top;
-  if (parent)
-  {
-    ::ScreenToClient((HWND) parent->GetHWND(), &point);
-  }
-
-  GetTextExtent(label, &w, &h, NULL, NULL, GetFont());
-  MoveWindow((HWND) GetHWND(), point.x, point.y, (int)(w + 10), (int)h,
-             TRUE);
-  SetWindowText((HWND) GetHWND(), (const char *)label);
+    // TODO

 }
 
 }
 

-WXHBRUSH wxStaticText::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
-{
-/*
-#if CTL3D
-  if ( m_useCtl3D )
-  {
-    HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
-      
-    if (hbrush != (HBRUSH) 0)
-      return hbrush;
-    else
-      return (HBRUSH)MSWDefWindowProc(message, wParam, lParam);
-  }
-#endif
-*/
-
-  if (GetParent()->GetTransparentBackground())
-    SetBkMode((HDC) pDC, TRANSPARENT);
-  else
-    SetBkMode((HDC) pDC, OPAQUE);
-
-  ::SetBkColor((HDC) pDC, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
-  ::SetTextColor((HDC) pDC, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
-
-  wxBrush *backgroundBrush = wxTheBrushList->FindOrCreateBrush(GetBackgroundColour(), wxSOLID);
-
-  // Note that this will be cleaned up in wxApp::OnIdle, if backgroundBrush
-  // has a zero usage count.
-//  backgroundBrush->RealizeResource();
-  return (WXHBRUSH) backgroundBrush->GetResourceHandle();
-}
-
-long wxStaticText::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-  // Ensure that static items get messages. Some controls don't like this
-  // message to be intercepted (e.g. RichEdit), hence the tests.
-  if (nMsg == WM_NCHITTEST)
-    return (long)HTCLIENT;
-
-  return wxWindow::MSWWindowProc(nMsg, wParam, lParam);
-}
-
-

diff --git a/src/stubs/statusbr.cpp b/src/stubs/statusbr.cpp
index 59fd64d927520b136fadbc4597f391dd6f0dc437..dff1ddec349d403d75c6596fff23fa53337937d7 100644 (file)
--- a/src/stubs/statusbr.cpp
+++ b/src/stubs/statusbr.cpp
@@ -59,21 +59,6 @@ bool wxStatusBarXX::Create(wxWindow *parent, wxWindowID id, long style)
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxStatusBarXX::CopyFieldsWidth(const int widths[])
-{
-  if (widths && !m_statusWidths)
-    m_statusWidths = new int[m_nFields];
-
-  if ( widths != NULL ) {
-    for ( int i = 0; i < m_nFields; i++ )
-      m_statusWidths[i] = widths[i];
-  }
-  else {
-    delete [] m_statusWidths;
-    m_statusWidths = NULL;
-  }
-}
-

 void wxStatusBarXX::SetFieldsCount(int nFields, const int widths[])
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );
 void wxStatusBarXX::SetFieldsCount(int nFields, const int widths[])
 {
   wxASSERT( (nFields > 0) && (nFields < 255) );


@@ -92,6 +77,21 @@ void wxStatusBarXX::SetStatusWidths(int n, const int widths[])
   SetFieldsWidth();
 }
 
   SetFieldsWidth();
 }
 

+void wxStatusBarXX::CopyFieldsWidth(const int widths[])
+{
+  if (widths && !m_statusWidths)
+    m_statusWidths = new int[m_nFields];
+
+  if ( widths != NULL ) {
+    for ( int i = 0; i < m_nFields; i++ )
+      m_statusWidths[i] = widths[i];
+  }
+  else {
+    delete [] m_statusWidths;
+    m_statusWidths = NULL;
+  }
+}
+

 void wxStatusBarXX::SetFieldsWidth()
 {
   int *pWidths = new int[m_nFields];
 void wxStatusBarXX::SetFieldsWidth()
 {
   int *pWidths = new int[m_nFields];

diff --git a/src/stubs/tabctrl.cpp b/src/stubs/tabctrl.cpp
index 3a84d4d66879efcb95bd03fcb9debb88ac33659c..b3b45a72d12a038b60322fd7c374ac7ca3108551 100644 (file)
--- a/src/stubs/tabctrl.cpp
+++ b/src/stubs/tabctrl.cpp
@@ -13,17 +13,13 @@
 #pragma implementation "tabctrl.h"
 #endif
 
 #pragma implementation "tabctrl.h"
 #endif
 

+#include "wx/control.h"

 #include "wx/tabctrl.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 #include "wx/tabctrl.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)

-       EVT_SIZE(wxTabCtrl::OnSize)
-       EVT_PAINT(wxTabCtrl::OnPaint)
-       EVT_KILL_FOCUS(wxTabCtrl::OnKillFocus)
-       EVT_MOUSE_EVENTS(wxTabCtrl::OnMouseEvent)
-    EVT_SYS_COLOUR_CHANGED(wxTabCtrl::OnSysColourChanged)

 END_EVENT_TABLE()
 #endif
 
 END_EVENT_TABLE()
 #endif
 

diff --git a/src/stubs/textctrl.cpp b/src/stubs/textctrl.cpp
index fb522df053e0a2194d09960b39f1ab56b0692330..f4fbdd3bbb12dfd5cb495a63c3f524057d93a186 100644 (file)
--- a/src/stubs/textctrl.cpp
+++ b/src/stubs/textctrl.cpp
@@ -19,6 +19,8 @@
 
 #include "wx/textctrl.h"
 #include "wx/settings.h"
 
 #include "wx/textctrl.h"
 #include "wx/settings.h"

+#include "wx/filefn.h"
+#include "wx/utils.h"

 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>
 
 #if defined(__BORLANDC__) && !defined(__WIN32__)
 #include <alloc.h>


@@ -132,7 +134,6 @@ long wxTextCtrl::GetLastPosition() const
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     // TODO
 void wxTextCtrl::Replace(long from, long to, const wxString& value)
 {
     // TODO

-    return 0;

 }
 
 void wxTextCtrl::Remove(long from, long to)
 }
 
 void wxTextCtrl::Remove(long from, long to)

diff --git a/src/stubs/thread.cpp b/src/stubs/thread.cpp
index 9a03aae3cd3c6d8979d7efd05caebf82a9605844..36e710b5b2b146c54881b2b49f04223784e917d7 100644 (file)
--- a/src/stubs/thread.cpp
+++ b/src/stubs/thread.cpp
@@ -15,6 +15,7 @@
 
 #include "wx/module.h"
 #include "wx/thread.h"
 
 #include "wx/module.h"
 #include "wx/thread.h"

+#include "wx/utils.h"

 
 enum thread_state {
   STATE_IDLE = 0,
 
 enum thread_state {
   STATE_IDLE = 0,


@@ -183,6 +184,7 @@ unsigned long wxThread::GetID() const
 bool wxThread::IsMain()
 {
     // TODO
 bool wxThread::IsMain()
 {
     // TODO

+    return FALSE;

 }
 
 wxThread::wxThread()
 }
 
 wxThread::wxThread()

diff --git a/src/stubs/timer.cpp b/src/stubs/timer.cpp
index f976056c779c976d191a0fad3cea64781a921a8d..5262040cf6dc4e5fb091ed200b32b5a9f385164b 100644 (file)
--- a/src/stubs/timer.cpp
+++ b/src/stubs/timer.cpp
@@ -22,7 +22,6 @@ IMPLEMENT_ABSTRACT_CLASS(wxTimer, wxObject)
 wxTimer::wxTimer()
 {
     m_milli = 0 ;
 wxTimer::wxTimer()
 {
     m_milli = 0 ;

-    m_lastMilli = -1 ;

     m_id = 0;
     m_oneShot = FALSE;
 }
     m_id = 0;
     m_oneShot = FALSE;
 }


@@ -35,13 +34,10 @@ wxTimer::~wxTimer()
 bool wxTimer::Start(int milliseconds,bool mode)
 {
     m_oneShot = mode ;
 bool wxTimer::Start(int milliseconds,bool mode)
 {
     m_oneShot = mode ;

-    if (m_milliseconds < 0)
-        m_milliseconds = lastMilli;
-
-    if (m_milliseconds <= 0)
+    if (milliseconds <= 0)

         return FALSE;
 
         return FALSE;
 

-    m_lastMilli = m_milli = m_milliseconds;
+    m_milli = milliseconds;

 
     // TODO: set the timer going.
     return FALSE;
 
     // TODO: set the timer going.
     return FALSE;

diff --git a/src/stubs/toolbar.cpp b/src/stubs/toolbar.cpp
index 61f34c8283ffae66e34e70426988a10fdcc434b0..ab0ace8901183607a2cf0e4f8457f5429c15e23a 100644 (file)
--- a/src/stubs/toolbar.cpp
+++ b/src/stubs/toolbar.cpp
@@ -13,17 +13,7 @@
 #pragma implementation "toolbar.h"
 #endif
 
 #pragma implementation "toolbar.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WX_PRECOMP
-#include "wx.h"
-#endif
-
+#include "wx/wx.h"

 #include "wx/toolbar.h"
 
 #if !USE_SHARED_LIBRARY
 #include "wx/toolbar.h"
 
 #if !USE_SHARED_LIBRARY


@@ -105,7 +95,6 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
         tool->m_enabled = enable;
         // TODO enable button
     }
         tool->m_enabled = enable;
         // TODO enable button
     }

-  }

 }
 
 void wxToolBar::ToggleTool(int toolIndex, bool toggle)
 }
 
 void wxToolBar::ToggleTool(int toolIndex, bool toggle)

diff --git a/src/stubs/treectrl.cpp b/src/stubs/treectrl.cpp
index 0b405a7106296bfdaa960dfe8510148a261739c7..5f346b38bc83686317c9e644e358078e2b16669c 100644 (file)
--- a/src/stubs/treectrl.cpp
+++ b/src/stubs/treectrl.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp

-// Purpose:     wxTreeCtrl
+// Purpose:     wxTreeCtrl. See also Robert's generic wxTreeCtrl.

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -13,7 +13,8 @@
 #pragma implementation "treectrl.h"
 #endif
 
 #pragma implementation "treectrl.h"
 #endif
 

-#include "wx/treectrl.h"
+#include "wx/stubs/textctrl.h"
+#include "wx/stubs/treectrl.h"

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)


@@ -281,11 +282,9 @@ bool wxTreeCtrl::ExpandItem(long item, int action)
       break;
 
     case wxTREE_EXPAND_COLLAPSE_RESET:
       break;
 
     case wxTREE_EXPAND_COLLAPSE_RESET:

-      mswAction = TVE_COLLAPSERESET;

       break;
 
     case wxTREE_EXPAND_TOGGLE:
       break;
 
     case wxTREE_EXPAND_TOGGLE:

-      mswAction = TVE_TOGGLE;

       break;
 
     default:
       break;
 
     default:

diff --git a/src/stubs/wave.cpp b/src/stubs/wave.cpp
index e908428ce470534de4ec780176e7fb7cb7163303..eb3a2603adc98d58aac72751d918eb8df04fe886 100644 (file)
--- a/src/stubs/wave.cpp
+++ b/src/stubs/wave.cpp
@@ -13,6 +13,8 @@
 #pragma implementation "wave.h"
 #endif
 
 #pragma implementation "wave.h"
 #endif
 

+#include "wx/object.h"
+#include "wx/string.h"

 #include "wx/stubs/wave.h"
 
 wxWave::wxWave()
 #include "wx/stubs/wave.h"
 
 wxWave::wxWave()

diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp
index 341ad00e51f48f6cd54fe5a6360230f026a71e30..22f44f8b8d93ca2e84fec3394f9552a5e47bae51 100644 (file)
--- a/src/stubs/window.cpp
+++ b/src/stubs/window.cpp
@@ -26,6 +26,7 @@
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"
 #include "wx/button.h"
 #include "wx/settings.h"
 #include "wx/msgdlg.h"

+#include "wx/frame.h"

 
 #include "wx/menuitem.h"
 #include "wx/log.h"
 
 #include "wx/menuitem.h"
 #include "wx/log.h"


@@ -254,13 +255,14 @@ wxEvtHandler *wxWindow::PopEventHandler(bool deleteHandler)
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
   if ( m_pDropTarget != 0 ) {
 void wxWindow::SetDropTarget(wxDropTarget *pDropTarget)
 {
   if ( m_pDropTarget != 0 ) {

-    m_pDropTarget->Revoke(m_hWnd);

     delete m_pDropTarget;
   }
 
   m_pDropTarget = pDropTarget;
   if ( m_pDropTarget != 0 )
     delete m_pDropTarget;
   }
 
   m_pDropTarget = pDropTarget;
   if ( m_pDropTarget != 0 )

-    m_pDropTarget->Register(m_hWnd);
+  {
+    // TODO
+  }

 }
 
 #endif
 }
 
 #endif


@@ -523,7 +525,7 @@ int wxWindow::GetScrollThumb(int orient) const
 void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 {
     // TODO
 void wxWindow::SetScrollPos(int orient, int pos, bool refresh)
 {
     // TODO

-    return 0;
+    return;

 }
 
 // New function that will replace some of the above.
 }
 
 // New function that will replace some of the above.


@@ -537,7 +539,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
 {
     // TODO
 void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
 {
     // TODO

-    return 0;
+    return;

 }
 
 void wxWindow::SetFont(const wxFont& font)
 }
 
 void wxWindow::SetFont(const wxFont& font)


@@ -685,17 +687,6 @@ void wxWindow::MakeModal(bool modal)
   }
 }
 
   }
 }
 

-// If nothing defined for this, try the parent.
-// E.g. we may be a button loaded from a resource, with no callback function
-// defined.
-void wxWindow::OnCommand(wxWindow& win, wxCommandEvent& event)
-{
-  if (GetEventHandler()->ProcessEvent(event) )
-       return;
-  if (m_windowParent)
-    m_windowParent->GetEventHandler()->OnCommand(win, event);
-}
-

 void wxWindow::SetConstraints(wxLayoutConstraints *c)
 {
   if (m_constraints)
 void wxWindow::SetConstraints(wxLayoutConstraints *c)
 {
   if (m_constraints)


@@ -1278,4 +1269,15 @@ bool wxWindow::IsExposed(const wxRect& rect) const
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 
     return (m_updateRegion.Contains(rect) != wxOutRegion);
 }
 

+/*
+ * Allocates control IDs
+ */
+
+int wxWindow::NewControlId()
+{
+    static int s_controlId = 0;
+    s_controlId ++;
+    return s_controlId;
+}
+

 
 

diff --git a/utils/ogl/samples/ogledit/ogledit.cpp b/utils/ogl/samples/ogledit/ogledit.cpp
index cc18d2d2c1226211741b8722b5b8a3db3f7f8769..ee31750c2bfa9ce0636d4069ef91c604e4f66113 100644 (file)
--- a/utils/ogl/samples/ogledit/ogledit.cpp
+++ b/utils/ogl/samples/ogledit/ogledit.cpp
@@ -37,9 +37,6 @@
 // in the application itself.
 IMPLEMENT_APP(MyApp)
 
 // in the application itself.
 IMPLEMENT_APP(MyApp)
 

-// This statement initialises the whole application
-MyApp myApp;
-

 MyApp::MyApp(void)
 {
   frame = NULL;
 MyApp::MyApp(void)
 {
   frame = NULL;


@@ -116,7 +113,7 @@ bool MyApp::OnInit(void)
   menu_bar->Append(help_menu, "&Help");
 
   frame->canvas = frame->CreateCanvas(NULL, frame);
   menu_bar->Append(help_menu, "&Help");
 
   frame->canvas = frame->CreateCanvas(NULL, frame);

-  frame->palette = myApp.CreatePalette(frame);
+  frame->palette = wxGetApp().CreatePalette(frame);

   myDocManager->CreateDocument("", wxDOC_NEW);
 
   //// Associate the menu bar with the frame
   myDocManager->CreateDocument("", wxDOC_NEW);
 
   //// Associate the menu bar with the frame


@@ -206,6 +203,6 @@ MyCanvas *MyFrame::CreateCanvas(wxView *view, wxFrame *parent)
 
 MyFrame *GetMainFrame(void)
 {
 
 MyFrame *GetMainFrame(void)
 {

-  return myApp.frame;
+  return wxGetApp().frame;

 }
 
 }
 

diff --git a/utils/ogl/src/basic.cpp b/utils/ogl/src/basic.cpp
index 8179c09499d94e37a3e0b4ce9c3321f268f376f7..8919f9b08dbd47de2a7abaf00aea7c31165a7b76 100644 (file)
--- a/utils/ogl/src/basic.cpp
+++ b/utils/ogl/src/basic.cpp
@@ -860,8 +860,8 @@ void wxShape::FindRegionNames(wxStringList& list)
 
 void wxShape::AssignNewIds()
 {
 
 void wxShape::AssignNewIds()
 {

-  if (m_id == 0)
-    m_id = NewId();
+//  if (m_id == 0)
+  m_id = NewId();

   wxNode *node = m_children.First();
   while (node)
   {
   wxNode *node = m_children.First();
   while (node)
   {


@@ -1535,7 +1535,13 @@ void wxShape::WritePrologAttributes(wxExpr *clause)
       clause->AddAttributeValue("pen_style", (long)penStyle);
 
     wxString penColour = wxTheColourDatabase->FindName(m_pen->GetColour());
       clause->AddAttributeValue("pen_style", (long)penStyle);
 
     wxString penColour = wxTheColourDatabase->FindName(m_pen->GetColour());

-    if ((penColour != "") && (penColour != "BLACK"))
+    if (penColour == "")
+    {
+      wxString hex(oglColourToHex(m_pen->GetColour()));
+      hex = wxString("#") + hex;
+      clause->AddAttributeValueString("pen_colour", hex);
+    }
+    else if (penColour != "BLACK")

       clause->AddAttributeValueString("pen_colour", penColour);
   }
 
       clause->AddAttributeValueString("pen_colour", penColour);
   }
 


@@ -1543,7 +1549,13 @@ void wxShape::WritePrologAttributes(wxExpr *clause)
   {
     wxString brushColour = wxTheColourDatabase->FindName(m_brush->GetColour());
 
   {
     wxString brushColour = wxTheColourDatabase->FindName(m_brush->GetColour());
 

-    if ((brushColour != "") && (brushColour != "WHITE"))
+    if (brushColour == "")
+    {
+      wxString hex(oglColourToHex(m_brush->GetColour()));
+      hex = wxString("#") + hex;
+      clause->AddAttributeValueString("brush_colour", hex);
+    }
+    else if (brushColour != "WHITE")

       clause->AddAttributeValueString("brush_colour", brushColour);
     
     if (m_brush->GetStyle() != wxSOLID)
       clause->AddAttributeValueString("brush_colour", brushColour);
     
     if (m_brush->GetStyle() != wxSOLID)


@@ -1795,11 +1807,25 @@ void wxShape::ReadPrologAttributes(wxExpr *clause)
   if (brush_string == "")
     brush_string = "WHITE";
 
   if (brush_string == "")
     brush_string = "WHITE";
 

-  m_pen = wxThePenList->FindOrCreatePen(pen_string, pen_width, pen_style);
+  if (pen_string[0] == '#')
+  {
+    wxColour col(oglHexToColour(pen_string.After('#')));
+    m_pen = wxThePenList->FindOrCreatePen(col, pen_width, pen_style);
+  }
+  else
+    m_pen = wxThePenList->FindOrCreatePen(pen_string, pen_width, pen_style);
+

   if (!m_pen)
     m_pen = wxBLACK_PEN;
 
   if (!m_pen)
     m_pen = wxBLACK_PEN;
 

-  m_brush = wxTheBrushList->FindOrCreateBrush(brush_string, brush_style);
+  if (brush_string[0] == '#')
+  {
+    wxColour col(oglHexToColour(brush_string.After('#')));
+    m_brush = wxTheBrushList->FindOrCreateBrush(col, brush_style);
+  }
+  else
+    m_brush = wxTheBrushList->FindOrCreateBrush(brush_string, brush_style);
+

   if (!m_brush)
     m_brush = wxWHITE_BRUSH;
 
   if (!m_brush)
     m_brush = wxWHITE_BRUSH;
 

diff --git a/utils/ogl/src/basic.h b/utils/ogl/src/basic.h
index dfca643087b447d9f58f85180756b7178c8260f1..ea72170a5b8f32b360f7d38e0b7d681f25a10da1 100644 (file)
--- a/utils/ogl/src/basic.h
+++ b/utils/ogl/src/basic.h
@@ -555,6 +555,8 @@ class wxRectangleShape: public wxShape
 
   inline float GetWidth() const { return m_width; }
   inline float GetHeight() const { return m_height; }
 
   inline float GetWidth() const { return m_width; }
   inline float GetHeight() const { return m_height; }

+  inline void SetWidth(float w) { m_width = w; }
+  inline void SetHeight(float h) { m_height = h; }

 
 protected:
   float m_width;
 
 protected:
   float m_width;

diff --git a/utils/ogl/src/basic2.cpp b/utils/ogl/src/basic2.cpp
index 26a048b28dfdaec045080055105b43640ec893cb..98f65933f0cf553e118a66af23dbd545adcb6eff 100644 (file)
--- a/utils/ogl/src/basic2.cpp
+++ b/utils/ogl/src/basic2.cpp
@@ -532,15 +532,18 @@ void wxPolygonShape::OnDraw(wxDC& dc)
 void wxPolygonShape::OnDrawOutline(wxDC& dc, float x, float y, float w, float h)
 {
   dc.SetBrush(wxTRANSPARENT_BRUSH);
 void wxPolygonShape::OnDrawOutline(wxDC& dc, float x, float y, float w, float h)
 {
   dc.SetBrush(wxTRANSPARENT_BRUSH);

+  // Multiply all points by proportion of new size to old size
+  float x_proportion = (float)(fabs(w/m_originalWidth));
+  float y_proportion = (float)(fabs(h/m_originalHeight));

 
 

-  int n = m_points->Number();
+  int n = m_originalPoints->Number();

   wxPoint *intPoints = new wxPoint[n];
   int i;
   for (i = 0; i < n; i++)
   {
   wxPoint *intPoints = new wxPoint[n];
   int i;
   for (i = 0; i < n; i++)
   {

-    wxRealPoint* point = (wxRealPoint*) m_points->Nth(i)->Data();
-    intPoints[i].x = (int) point->x;
-    intPoints[i].y = (int) point->y;
+    wxRealPoint* point = (wxRealPoint*) m_originalPoints->Nth(i)->Data();
+    intPoints[i].x = (int) (x_proportion * point->x);
+    intPoints[i].y = (int) (y_proportion * point->y);

   }
   dc.DrawPolygon(n, intPoints, x, y);
   delete[] intPoints;
   }
   dc.DrawPolygon(n, intPoints, x, y);
   delete[] intPoints;


@@ -1699,6 +1702,21 @@ wxPolygonControlPoint::~wxPolygonControlPoint()
 {
 }
 
 {
 }
 

+// Calculate what new size would be, at end of resize
+void wxPolygonControlPoint::CalculateNewSize(float x, float y)
+{
+  float bound_x;
+  float bound_y;
+  GetShape()->GetBoundingBoxMin(&bound_x, &bound_y);
+
+  float dist = (float)sqrt((x - m_shape->GetX())*(x - m_shape->GetX()) +
+                    (y - m_shape->GetY())*(y - m_shape->GetY()));
+
+  m_newSize.x = (float)(dist/this->m_originalDistance)*this->m_originalSize.x;
+  m_newSize.y = (float)(dist/this->m_originalDistance)*this->m_originalSize.y;
+}
+
+

 // Implement resizing polygon or moving the vertex.
 void wxPolygonControlPoint::OnDragLeft(bool draw, float x, float y, int keys, int attachment)
 {
 // Implement resizing polygon or moving the vertex.
 void wxPolygonControlPoint::OnDragLeft(bool draw, float x, float y, int keys, int attachment)
 {


@@ -1730,18 +1748,11 @@ void wxPolygonShape::OnSizingDragLeft(wxControlPoint* pt, bool draw, float x, fl
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 

-  float bound_x;
-  float bound_y;
-  this->GetBoundingBoxMin(&bound_x, &bound_y);
-/*
-  float new_width = (float)(2.0*fabs(x - this->GetX()));
-  float new_height = (float)(2.0*fabs(y - this->GetY()));
-*/
-  float dist = (float)sqrt((x - this->GetX())*(x - this->GetX()) +
-                    (y - this->GetY())*(y - this->GetY()));
-
-  if (keys & KEY_CTRL)
+  if (0) // keys & KEY_CTRL)

   {
   {

+    // TODO: mend this code. Currently we rely on altering the
+    // actual points, but we should assume we're not, as per
+    // the normal sizing case.

     m_canvas->Snap(&x, &y);
 
     // Move point
     m_canvas->Snap(&x, &y);
 
     // Move point


@@ -1754,15 +1765,11 @@ void wxPolygonShape::OnSizingDragLeft(wxControlPoint* pt, bool draw, float x, fl
   }
   else
   {
   }
   else
   {

-    float new_width = (float)(dist/ppt->m_originalDistance)*ppt->m_originalSize.x;
-    float new_height = (float)(dist/ppt->m_originalDistance)*ppt->m_originalSize.y;
-
-    // Non-recursive SetSize for speed
-    this->SetSize(new_width, new_height, FALSE);
+    ppt->CalculateNewSize(x, y);

   }
   }

-  float w, h;
-  this->GetBoundingBoxMax(&w, &h);
-  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(), w, h);
+
+  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
+       ppt->GetNewSize().x, ppt->GetNewSize().y);

 }
 
 void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, float x, float y, int keys, int attachment)
 }
 
 void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, float x, float y, int keys, int attachment)


@@ -1782,7 +1789,6 @@ void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, float x, float y,
 
   float dist = (float)sqrt((x - this->GetX())*(x - this->GetX()) +
                     (y - this->GetY())*(y - this->GetY()));
 
   float dist = (float)sqrt((x - this->GetX())*(x - this->GetX()) +
                     (y - this->GetY())*(y - this->GetY()));

-

   ppt->m_originalDistance = dist;
   ppt->m_originalSize.x = bound_x;
   ppt->m_originalSize.y = bound_y;
   ppt->m_originalDistance = dist;
   ppt->m_originalSize.x = bound_x;
   ppt->m_originalSize.y = bound_y;


@@ -1793,8 +1799,11 @@ void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, float x, float y,
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 
   dc.SetPen(dottedPen);
   dc.SetBrush((* wxTRANSPARENT_BRUSH));
 

-  if (keys & KEY_CTRL)
+  if (0) // keys & KEY_CTRL)

   {
   {

+    // TODO: mend this code. Currently we rely on altering the
+    // actual points, but we should assume we're not, as per
+    // the normal sizing case.

     m_canvas->Snap(&x, &y);
 
     // Move point
     m_canvas->Snap(&x, &y);
 
     // Move point


@@ -1807,22 +1816,19 @@ void wxPolygonShape::OnSizingBeginDragLeft(wxControlPoint* pt, float x, float y,
   }
   else
   {
   }
   else
   {

-    float new_width = (float)(dist/ppt->m_originalDistance)*ppt->m_originalSize.x;
-    float new_height = (float)(dist/ppt->m_originalDistance)*ppt->m_originalSize.y;
-
-    // Non-recursive SetSize for speed
-    this->SetSize(new_width, new_height, FALSE);
+    ppt->CalculateNewSize(x, y);

   }
 
   }
 

-  float w, h;
-  this->GetBoundingBoxMax(&w, &h);
-  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(), w, h);
+  this->GetEventHandler()->OnDrawOutline(dc, this->GetX(), this->GetY(),
+       ppt->GetNewSize().x, ppt->GetNewSize().y);

 
   m_canvas->CaptureMouse();
 }
 
 void wxPolygonShape::OnSizingEndDragLeft(wxControlPoint* pt, float x, float y, int keys, int attachment)
 {
 
   m_canvas->CaptureMouse();
 }
 
 void wxPolygonShape::OnSizingEndDragLeft(wxControlPoint* pt, float x, float y, int keys, int attachment)
 {

+  wxPolygonControlPoint* ppt = (wxPolygonControlPoint*) pt;
+

   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 
   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 


@@ -1835,6 +1841,10 @@ void wxPolygonShape::OnSizingEndDragLeft(wxControlPoint* pt, float x, float y, i
     ((wxPolygonShape *)this)->CalculateBoundingBox();
     ((wxPolygonShape *)this)->UpdateOriginalPoints();
   }
     ((wxPolygonShape *)this)->CalculateBoundingBox();
     ((wxPolygonShape *)this)->UpdateOriginalPoints();
   }

+  else
+  {
+    SetSize(ppt->GetNewSize().x, ppt->GetNewSize().y);
+  }

 
   ((wxPolygonShape *)this)->CalculateBoundingBox();
   ((wxPolygonShape *)this)->CalculatePolygonCentre();
 
   ((wxPolygonShape *)this)->CalculateBoundingBox();
   ((wxPolygonShape *)this)->CalculatePolygonCentre();

diff --git a/utils/ogl/src/basicp.h b/utils/ogl/src/basicp.h
index 2c04e63bf64f8e2a93ea254facafbd212072a653..e664922830b99ae17aeaf224bdfce62343d9b101 100644 (file)
--- a/utils/ogl/src/basicp.h
+++ b/utils/ogl/src/basicp.h
@@ -102,10 +102,17 @@ class wxPolygonControlPoint: public wxControlPoint
   void OnBeginDragLeft(float x, float y, int keys=0, int attachment = 0);
   void OnEndDragLeft(float x, float y, int keys=0, int attachment = 0);
 
   void OnBeginDragLeft(float x, float y, int keys=0, int attachment = 0);
   void OnEndDragLeft(float x, float y, int keys=0, int attachment = 0);
 

+  // Calculate what new size would be, at end of resize
+  virtual void CalculateNewSize(float x, float y);
+
+  // Get new size
+  inline wxRealPoint GetNewSize() const { return m_newSize; };
+

 public:
   wxRealPoint*      m_polygonVertex;
   wxRealPoint       m_originalSize;
   float             m_originalDistance;
 public:
   wxRealPoint*      m_polygonVertex;
   wxRealPoint       m_originalSize;
   float             m_originalDistance;

+  wxRealPoint       m_newSize;

 };
 
 /*
 };
 
 /*

diff --git a/utils/ogl/src/drawn.cpp b/utils/ogl/src/drawn.cpp
index b9a6cb8102df2f54881f9174214d016a230e67c6..12569f7553a3edbd56976b5ca25e5eda482c1032 100644 (file)
--- a/utils/ogl/src/drawn.cpp
+++ b/utils/ogl/src/drawn.cpp
@@ -49,7 +49,7 @@ extern char *GraphicsBuffer;
  *
  */
 
  *
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxDrawnShape, wxShape)
+IMPLEMENT_DYNAMIC_CLASS(wxDrawnShape, wxRectangleShape)

 
 wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
 {
 
 wxDrawnShape::wxDrawnShape():wxRectangleShape(100.0, 50.0)
 {


@@ -99,11 +99,13 @@ void wxDrawnShape::SetSize(float w, float h, bool recursive)
 void wxDrawnShape::Scale(float sx, float sy)
 {
   m_metafile.Scale(sx, sy);
 void wxDrawnShape::Scale(float sx, float sy)
 {
   m_metafile.Scale(sx, sy);

+  m_metafile.CalculateSize(this);

 }
 
 void wxDrawnShape::Translate(float x, float y)
 {
   m_metafile.Translate(x, y);
 }
 
 void wxDrawnShape::Translate(float x, float y)
 {
   m_metafile.Translate(x, y);

+  m_metafile.CalculateSize(this);

 }
 
 void wxDrawnShape::Rotate(float x, float y, float theta)
 }
 
 void wxDrawnShape::Rotate(float x, float y, float theta)


@@ -130,6 +132,8 @@ void wxDrawnShape::Rotate(float x, float y, float theta)
     node = node->Next();
   }
   m_rotation = theta;
     node = node->Next();
   }
   m_rotation = theta;

+
+  m_metafile.CalculateSize(this);

 }
 
 #ifdef PROLOGIO
 }
 
 #ifdef PROLOGIO


@@ -179,6 +183,96 @@ bool wxDrawnShape::LoadFromMetaFile(char *filename)
   return m_metafile.LoadFromMetaFile(filename, &m_width, &m_height);
 }
 
   return m_metafile.LoadFromMetaFile(filename, &m_width, &m_height);
 }
 

+// Set of functions for drawing into a pseudo metafile.
+// They use integers, but doubles are used internally for accuracy
+// when scaling.
+
+void wxDrawnShape::DrawLine(const wxPoint& pt1, const wxPoint& pt2)
+{
+    m_metafile.DrawLine(pt1, pt2);
+}
+
+void wxDrawnShape::DrawRectangle(const wxRect& rect)
+{
+    m_metafile.DrawRectangle(rect);
+}
+
+void wxDrawnShape::DrawRoundedRectangle(const wxRect& rect, double radius)
+{
+    m_metafile.DrawRoundedRectangle(rect, radius);
+}
+
+void wxDrawnShape::DrawEllipse(const wxRect& rect)
+{
+    m_metafile.DrawEllipse(rect);
+}
+
+void wxDrawnShape::DrawPoint(const wxPoint& pt)
+{
+    m_metafile.DrawPoint(pt);
+}
+
+void wxDrawnShape::DrawText(const wxString& text, const wxPoint& pt)
+{
+    m_metafile.DrawText(text, pt);
+}
+
+void wxDrawnShape::DrawLines(int n, wxPoint pts[])
+{
+    m_metafile.DrawLines(n, pts);
+}
+
+void wxDrawnShape::DrawPolygon(int n, wxPoint pts[])
+{
+    m_metafile.DrawPolygon(n, pts);
+}
+
+void wxDrawnShape::DrawSpline(int n, wxPoint pts[])
+{
+    m_metafile.DrawSpline(n, pts);
+}
+
+void wxDrawnShape::SetClippingRect(const wxRect& rect)
+{
+    m_metafile.SetClippingRect(rect);
+}
+
+void wxDrawnShape::DestroyClippingRect()
+{
+    m_metafile.DestroyClippingRect();
+}
+
+void wxDrawnShape::SetPen(wxPen* pen, bool isOutline)
+{
+    m_metafile.SetPen(pen, isOutline);
+}
+
+void wxDrawnShape::SetBrush(wxBrush* brush, bool isFill)
+{
+    m_metafile.SetBrush(brush, isFill);
+}
+
+void wxDrawnShape::SetFont(wxFont* font)
+{
+    m_metafile.SetFont(font);
+}
+
+void wxDrawnShape::SetTextColour(const wxColour& colour)
+{
+    m_metafile.SetTextColour(colour);
+}
+
+void wxDrawnShape::SetBackgroundColour(const wxColour& colour)
+{
+    m_metafile.SetBackgroundColour(colour);
+}
+
+void wxDrawnShape::SetBackgroundMode(int mode)
+{
+    m_metafile.SetBackgroundMode(mode);
+}
+
+

 /*
  * Individual operations
  *
 /*
  * Individual operations
  *


@@ -192,27 +286,27 @@ bool wxDrawnShape::LoadFromMetaFile(char *filename)
 wxOpSetGDI::wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode):
   wxDrawOp(theOp)
 {
 wxOpSetGDI::wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode):
   wxDrawOp(theOp)
 {

-  gdiIndex = theGdiIndex;
-  image = theImage;
-  mode = theMode;
+  m_gdiIndex = theGdiIndex;
+  m_image = theImage;
+  m_mode = theMode;

 }
 
 void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
 {
 }
 
 void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_SET_PEN:
     {
       // Check for overriding this operation for outline
       // colour
   {
     case DRAWOP_SET_PEN:
     {
       // Check for overriding this operation for outline
       // colour

-      if (image->m_outlineColours.Member((wxObject *)gdiIndex))
+      if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))

       {
       {

-        if (image->m_outlinePen)
-          dc.SetPen(image->m_outlinePen);
+        if (m_image->m_outlinePen)
+          dc.SetPen(m_image->m_outlinePen);

       }
       else
       {
       }
       else
       {

-        wxNode *node = image->m_gdiObjects.Nth(gdiIndex);
+        wxNode *node = m_image->m_gdiObjects.Nth(m_gdiIndex);

         if (node)
         {
           wxPen *pen = (wxPen *)node->Data();
         if (node)
         {
           wxPen *pen = (wxPen *)node->Data();


@@ -226,26 +320,26 @@ void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
     {
       // Check for overriding this operation for outline or fill
       // colour
     {
       // Check for overriding this operation for outline or fill
       // colour

-      if (image->m_outlineColours.Member((wxObject *)gdiIndex))
+      if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))

       {
         // Need to construct a brush to match the outline pen's colour
       {
         // Need to construct a brush to match the outline pen's colour

-        if (image->m_outlinePen)
+        if (m_image->m_outlinePen)

         {
         {

-          wxBrush *br = wxTheBrushList->FindOrCreateBrush(image->m_outlinePen->GetColour(), wxSOLID);
+          wxBrush *br = wxTheBrushList->FindOrCreateBrush(m_image->m_outlinePen->GetColour(), wxSOLID);

           if (br)
             dc.SetBrush(br);
         }
       }
           if (br)
             dc.SetBrush(br);
         }
       }

-      else if (image->m_fillColours.Member((wxObject *)gdiIndex))
+      else if (m_image->m_fillColours.Member((wxObject *)m_gdiIndex))

       {
       {

-        if (image->m_fillBrush)
+        if (m_image->m_fillBrush)

         {
         {

-          dc.SetBrush(image->m_fillBrush);
+          dc.SetBrush(m_image->m_fillBrush);

         }
       }
       else
       {
         }
       }
       else
       {

-        wxNode *node = image->m_gdiObjects.Nth(gdiIndex);
+        wxNode *node = m_image->m_gdiObjects.Nth(m_gdiIndex);

         if (node)
         {
           wxBrush *brush = (wxBrush *)node->Data();
         if (node)
         {
           wxBrush *brush = (wxBrush *)node->Data();


@@ -257,7 +351,7 @@ void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
     }
     case DRAWOP_SET_FONT:
     {
     }
     case DRAWOP_SET_FONT:
     {

-      wxNode *node = image->m_gdiObjects.Nth(gdiIndex);
+      wxNode *node = m_image->m_gdiObjects.Nth(m_gdiIndex);

       if (node)
       {
         wxFont *font = (wxFont *)node->Data();
       if (node)
       {
         wxFont *font = (wxFont *)node->Data();


@@ -268,19 +362,19 @@ void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
     }
     case DRAWOP_SET_TEXT_COLOUR:
     {
     }
     case DRAWOP_SET_TEXT_COLOUR:
     {

-      wxColour col(r,g,b);
+      wxColour col(m_r,m_g,m_b);

       dc.SetTextForeground(col);
       break;
     }
     case DRAWOP_SET_BK_COLOUR:
     {
       dc.SetTextForeground(col);
       break;
     }
     case DRAWOP_SET_BK_COLOUR:
     {

-      wxColour col(r,g,b);
+      wxColour col(m_r,m_g,m_b);

       dc.SetTextBackground(col);
       break;
     }
     case DRAWOP_SET_BK_MODE:
     {
       dc.SetTextBackground(col);
       break;
     }
     case DRAWOP_SET_BK_MODE:
     {

-      dc.SetBackgroundMode(mode);
+      dc.SetBackgroundMode(m_mode);

       break;
     }
     default:
       break;
     }
     default:


@@ -290,37 +384,37 @@ void wxOpSetGDI::Do(wxDC& dc, float xoffset, float yoffset)
 
 wxDrawOp *wxOpSetGDI::Copy(wxPseudoMetaFile *newImage)
 {
 
 wxDrawOp *wxOpSetGDI::Copy(wxPseudoMetaFile *newImage)
 {

-  wxOpSetGDI *newOp = new wxOpSetGDI(op, newImage, gdiIndex, mode);
-  newOp->r = r;
-  newOp->g = g;
-  newOp->b = b;
+  wxOpSetGDI *newOp = new wxOpSetGDI(m_op, newImage, m_gdiIndex, m_mode);
+  newOp->m_r = m_r;
+  newOp->m_g = m_g;
+  newOp->m_b = m_b;

   return newOp;
 }
 
   return newOp;
 }
 

-wxExpr *wxOpSetGDI::WritewxExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpSetGDI::WriteExpr(wxPseudoMetaFile *image)

 {
   wxExpr *expr = new wxExpr(PrologList);
 {
   wxExpr *expr = new wxExpr(PrologList);

-  expr->Append(new wxExpr((long)op));
-  switch (op)
+  expr->Append(new wxExpr((long)m_op));
+  switch (m_op)

   {
     case DRAWOP_SET_PEN:
     case DRAWOP_SET_BRUSH:
     case DRAWOP_SET_FONT:
     {
   {
     case DRAWOP_SET_PEN:
     case DRAWOP_SET_BRUSH:
     case DRAWOP_SET_FONT:
     {

-      expr->Append(new wxExpr((long)gdiIndex));
+      expr->Append(new wxExpr((long)m_gdiIndex));

       break;
     }
     case DRAWOP_SET_TEXT_COLOUR:
     case DRAWOP_SET_BK_COLOUR:
     {
       break;
     }
     case DRAWOP_SET_TEXT_COLOUR:
     case DRAWOP_SET_BK_COLOUR:
     {

-      expr->Append(new wxExpr((long)r));
-      expr->Append(new wxExpr((long)g));
-      expr->Append(new wxExpr((long)b));
+      expr->Append(new wxExpr((long)m_r));
+      expr->Append(new wxExpr((long)m_g));
+      expr->Append(new wxExpr((long)m_b));

       break;
     }
     case DRAWOP_SET_BK_MODE:
     {
       break;
     }
     case DRAWOP_SET_BK_MODE:
     {

-      expr->Append(new wxExpr((long)mode));
+      expr->Append(new wxExpr((long)m_mode));

       break;
     }
     default:
       break;
     }
     default:


@@ -329,28 +423,28 @@ wxExpr *wxOpSetGDI::WritewxExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpSetGDI::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpSetGDI::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)

 {
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_SET_PEN:
     case DRAWOP_SET_BRUSH:
     case DRAWOP_SET_FONT:
     {
   {
     case DRAWOP_SET_PEN:
     case DRAWOP_SET_BRUSH:
     case DRAWOP_SET_FONT:
     {

-      gdiIndex = (int)expr->Nth(1)->IntegerValue();
+      m_gdiIndex = (int)expr->Nth(1)->IntegerValue();

       break;
     }
     case DRAWOP_SET_TEXT_COLOUR:
     case DRAWOP_SET_BK_COLOUR:
     {
       break;
     }
     case DRAWOP_SET_TEXT_COLOUR:
     case DRAWOP_SET_BK_COLOUR:
     {

-      r = (unsigned char)expr->Nth(1)->IntegerValue();
-      g = (unsigned char)expr->Nth(2)->IntegerValue();
-      b = (unsigned char)expr->Nth(3)->IntegerValue();
+      m_r = (unsigned char)expr->Nth(1)->IntegerValue();
+      m_g = (unsigned char)expr->Nth(2)->IntegerValue();
+      m_b = (unsigned char)expr->Nth(3)->IntegerValue();

       break;
     }
     case DRAWOP_SET_BK_MODE:
     {
       break;
     }
     case DRAWOP_SET_BK_MODE:
     {

-      mode = (int)expr->Nth(1)->IntegerValue();
+      m_mode = (int)expr->Nth(1)->IntegerValue();

       break;
     }
     default:
       break;
     }
     default:


@@ -366,25 +460,25 @@ void wxOpSetGDI::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
 wxOpSetClipping::wxOpSetClipping(int theOp, float theX1, float theY1,
     float theX2, float theY2):wxDrawOp(theOp)
 {
 wxOpSetClipping::wxOpSetClipping(int theOp, float theX1, float theY1,
     float theX2, float theY2):wxDrawOp(theOp)
 {

-  x1 = theX1;
-  y1 = theY1;
-  x2 = theX2;
-  y2 = theY2;
+  m_x1 = theX1;
+  m_y1 = theY1;
+  m_x2 = theX2;
+  m_y2 = theY2;

 }
 
 wxDrawOp *wxOpSetClipping::Copy(wxPseudoMetaFile *newImage)
 {
 }
 
 wxDrawOp *wxOpSetClipping::Copy(wxPseudoMetaFile *newImage)
 {

-  wxOpSetClipping *newOp = new wxOpSetClipping(op, x1, y1, x2, y2);
+  wxOpSetClipping *newOp = new wxOpSetClipping(m_op, m_x1, m_y1, m_x2, m_y2);

   return newOp;
 }
     
 void wxOpSetClipping::Do(wxDC& dc, float xoffset, float yoffset)
 {
   return newOp;
 }
     
 void wxOpSetClipping::Do(wxDC& dc, float xoffset, float yoffset)
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_SET_CLIPPING_RECT:
     {
   {
     case DRAWOP_SET_CLIPPING_RECT:
     {

-      dc.SetClippingRegion(x1 + xoffset, y1 + yoffset, x2 + xoffset, y2 + yoffset);
+      dc.SetClippingRegion(m_x1 + xoffset, m_y1 + yoffset, m_x2 + xoffset, m_y2 + yoffset);

       break;
     }
     case DRAWOP_DESTROY_CLIPPING_RECT:
       break;
     }
     case DRAWOP_DESTROY_CLIPPING_RECT:


@@ -399,30 +493,30 @@ void wxOpSetClipping::Do(wxDC& dc, float xoffset, float yoffset)
 
 void wxOpSetClipping::Scale(float xScale, float yScale)
 {
 
 void wxOpSetClipping::Scale(float xScale, float yScale)
 {

-  x1 *= xScale;
-  y1 *= yScale;
-  x2 *= xScale;
-  y2 *= yScale;
+  m_x1 *= xScale;
+  m_y1 *= yScale;
+  m_x2 *= xScale;
+  m_y2 *= yScale;

 }
 
 void wxOpSetClipping::Translate(float x, float y)
 {
 }
 
 void wxOpSetClipping::Translate(float x, float y)
 {

-  x1 += x;
-  y1 += y;
+  m_x1 += x;
+  m_y1 += y;

 }
 
 }
 

-wxExpr *wxOpSetClipping::WritewxExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpSetClipping::WriteExpr(wxPseudoMetaFile *image)

 {
   wxExpr *expr = new wxExpr(PrologList);
 {
   wxExpr *expr = new wxExpr(PrologList);

-  expr->Append(new wxExpr((long)op));
-  switch (op)
+  expr->Append(new wxExpr((long)m_op));
+  switch (m_op)

   {
     case DRAWOP_SET_CLIPPING_RECT:
     {
   {
     case DRAWOP_SET_CLIPPING_RECT:
     {

-      expr->Append(new wxExpr(x1));
-      expr->Append(new wxExpr(y1));
-      expr->Append(new wxExpr(x2));
-      expr->Append(new wxExpr(y2));
+      expr->Append(new wxExpr(m_x1));
+      expr->Append(new wxExpr(m_y1));
+      expr->Append(new wxExpr(m_x2));
+      expr->Append(new wxExpr(m_y2));

       break;
     }
     default:
       break;
     }
     default:


@@ -431,16 +525,16 @@ wxExpr *wxOpSetClipping::WritewxExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpSetClipping::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpSetClipping::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)

 {
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_SET_CLIPPING_RECT:
     {
   {
     case DRAWOP_SET_CLIPPING_RECT:
     {

-      x1 = expr->Nth(1)->RealValue();
-      y1 = expr->Nth(2)->RealValue();
-      x2 = expr->Nth(3)->RealValue();
-      y2 = expr->Nth(4)->RealValue();
+      m_x1 = expr->Nth(1)->RealValue();
+      m_y1 = expr->Nth(2)->RealValue();
+      m_x2 = expr->Nth(3)->RealValue();
+      m_y2 = expr->Nth(4)->RealValue();

       break;
     }
     default:
       break;
     }
     default:


@@ -456,58 +550,58 @@ void wxOpSetClipping::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
 wxOpDraw::wxOpDraw(int theOp, float theX1, float theY1, float theX2, float theY2,
          float theRadius, char *s):wxDrawOp(theOp)
 {
 wxOpDraw::wxOpDraw(int theOp, float theX1, float theY1, float theX2, float theY2,
          float theRadius, char *s):wxDrawOp(theOp)
 {

-  x1 = theX1;
-  y1 = theY1;
-  x2 = theX2;
-  y2 = theY2;
-  radius = theRadius;
-  if (s) textString = copystring(s);
-  else textString = NULL;
+  m_x1 = theX1;
+  m_y1 = theY1;
+  m_x2 = theX2;
+  m_y2 = theY2;
+  m_radius = theRadius;
+  if (s) m_textString = copystring(s);
+  else m_textString = NULL;

 }
 
 wxOpDraw::~wxOpDraw()
 {
 }
 
 wxOpDraw::~wxOpDraw()
 {

-  if (textString) delete[] textString;
+  if (m_textString) delete[] m_textString;

 }
 
 wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *newImage)
 {
 }
 
 wxDrawOp *wxOpDraw::Copy(wxPseudoMetaFile *newImage)
 {

-  wxOpDraw *newOp = new wxOpDraw(op, x1, y1, x2, y2, radius, textString);
+  wxOpDraw *newOp = new wxOpDraw(m_op, m_x1, m_y1, m_x2, m_y2, m_radius, m_textString);

   return newOp;
 }
 
 void wxOpDraw::Do(wxDC& dc, float xoffset, float yoffset)
 {
   return newOp;
 }
 
 void wxOpDraw::Do(wxDC& dc, float xoffset, float yoffset)
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_DRAW_LINE:
     {
   {
     case DRAWOP_DRAW_LINE:
     {

-      dc.DrawLine(x1+xoffset, y1+yoffset, x2+xoffset, y2+yoffset);
+      dc.DrawLine(m_x1+xoffset, m_y1+yoffset, m_x2+xoffset, m_y2+yoffset);

       break;
     }
     case DRAWOP_DRAW_RECT:
     {
       break;
     }
     case DRAWOP_DRAW_RECT:
     {

-      dc.DrawRectangle(x1+xoffset, y1+yoffset, x2+xoffset, y2+yoffset);
+      dc.DrawRectangle(m_x1+xoffset, m_y1+yoffset, m_x2, m_y2);

       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {
       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {

-      dc.DrawRoundedRectangle(x1+xoffset, y1+yoffset, x2+xoffset, y2+yoffset, radius);
+      dc.DrawRoundedRectangle(m_x1+xoffset, m_y1+yoffset, m_x2, m_y2, m_radius);

       break;
     }
     case DRAWOP_DRAW_ELLIPSE:
     {
       break;
     }
     case DRAWOP_DRAW_ELLIPSE:
     {

-      dc.DrawEllipse(x1+xoffset, y1+yoffset, x2+xoffset, y2+yoffset);
+      dc.DrawEllipse(m_x1+xoffset, m_y1+yoffset, m_x2, m_y2);

       break;
     }
     case DRAWOP_DRAW_POINT:
     {
       break;
     }
     case DRAWOP_DRAW_POINT:
     {

-      dc.DrawPoint(x1+xoffset, y1+yoffset);
+      dc.DrawPoint(m_x1+xoffset, m_y1+yoffset);

       break;
     }
     case DRAWOP_DRAW_TEXT:
     {
       break;
     }
     case DRAWOP_DRAW_TEXT:
     {

-      dc.DrawText(textString, x1+xoffset, y1+yoffset);
+      dc.DrawText(m_textString, m_x1+xoffset, m_y1+yoffset);

       break;
     }
     default:
       break;
     }
     default:


@@ -517,30 +611,30 @@ void wxOpDraw::Do(wxDC& dc, float xoffset, float yoffset)
 
 void wxOpDraw::Scale(float scaleX, float scaleY)
 {
 
 void wxOpDraw::Scale(float scaleX, float scaleY)
 {

-  x1 *= scaleX;
-  y1 *= scaleY;
-  x2 *= scaleX;
-  y2 *= scaleY;
-  radius *= scaleX;
+  m_x1 *= scaleX;
+  m_y1 *= scaleY;
+  m_x2 *= scaleX;
+  m_y2 *= scaleY;
+  m_radius *= scaleX;

 }
 
 void wxOpDraw::Translate(float x, float y)
 {
 }
 
 void wxOpDraw::Translate(float x, float y)
 {

-  x1 += x;
-  y1 += y;
+  m_x1 += x;
+  m_y1 += y;

 }
 
 void wxOpDraw::Rotate(float x, float y, float sinTheta, float cosTheta)
 {
 }
 
 void wxOpDraw::Rotate(float x, float y, float sinTheta, float cosTheta)
 {

-  x1 = x1*cosTheta - y1*sinTheta + x*(1 - cosTheta) + y*sinTheta;
-  y1 = x1*sinTheta + y1*cosTheta + y*(1 - cosTheta) + x*sinTheta;
-  
-  switch (op)
+  m_x1 = m_x1*cosTheta - m_y1*sinTheta + x*(1 - cosTheta) + y*sinTheta;
+  m_y1 = m_x1*sinTheta + m_y1*cosTheta + y*(1 - cosTheta) + x*sinTheta;
+
+  switch (m_op)

   {
     case DRAWOP_DRAW_LINE:
     {
   {
     case DRAWOP_DRAW_LINE:
     {

-      x2 = x2*cosTheta - y2*sinTheta + x*(1 - cosTheta) + y*sinTheta;
-      y2 = x2*sinTheta + y2*cosTheta + y*(1 - cosTheta) + x*sinTheta;
+      m_x2 = m_x2*cosTheta - m_y2*sinTheta + x*(1 - cosTheta) + y*sinTheta;
+      m_y2 = m_x2*sinTheta + m_y2*cosTheta + y*(1 - cosTheta) + x*sinTheta;

       break;
     }
     default:
       break;
     }
     default:


@@ -548,42 +642,42 @@ void wxOpDraw::Rotate(float x, float y, float sinTheta, float cosTheta)
   }
 }
 
   }
 }
 

-wxExpr *wxOpDraw::WritewxExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpDraw::WriteExpr(wxPseudoMetaFile *image)

 {
   wxExpr *expr = new wxExpr(PrologList);
 {
   wxExpr *expr = new wxExpr(PrologList);

-  expr->Append(new wxExpr((long)op));
-  switch (op)
+  expr->Append(new wxExpr((long)m_op));
+  switch (m_op)

   {
     case DRAWOP_DRAW_LINE:
     case DRAWOP_DRAW_RECT:
     case DRAWOP_DRAW_ELLIPSE:
     {
   {
     case DRAWOP_DRAW_LINE:
     case DRAWOP_DRAW_RECT:
     case DRAWOP_DRAW_ELLIPSE:
     {

-      expr->Append(new wxExpr(x1));
-      expr->Append(new wxExpr(y1));
-      expr->Append(new wxExpr(x2));
-      expr->Append(new wxExpr(y2));
+      expr->Append(new wxExpr(m_x1));
+      expr->Append(new wxExpr(m_y1));
+      expr->Append(new wxExpr(m_x2));
+      expr->Append(new wxExpr(m_y2));

       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {
       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {

-      expr->Append(new wxExpr(x1));
-      expr->Append(new wxExpr(y1));
-      expr->Append(new wxExpr(x2));
-      expr->Append(new wxExpr(y2));
-      expr->Append(new wxExpr(radius));
+      expr->Append(new wxExpr(m_x1));
+      expr->Append(new wxExpr(m_y1));
+      expr->Append(new wxExpr(m_x2));
+      expr->Append(new wxExpr(m_y2));
+      expr->Append(new wxExpr(m_radius));

       break;
     }
     case DRAWOP_DRAW_POINT:
     {
       break;
     }
     case DRAWOP_DRAW_POINT:
     {

-      expr->Append(new wxExpr(x1));
-      expr->Append(new wxExpr(y1));
+      expr->Append(new wxExpr(m_x1));
+      expr->Append(new wxExpr(m_y1));

       break;
     }
     case DRAWOP_DRAW_TEXT:
     {
       break;
     }
     case DRAWOP_DRAW_TEXT:
     {

-      expr->Append(new wxExpr(x1));
-      expr->Append(new wxExpr(y1));
-      expr->Append(new wxExpr(PrologString, textString));
+      expr->Append(new wxExpr(m_x1));
+      expr->Append(new wxExpr(m_y1));
+      expr->Append(new wxExpr(PrologString, m_textString));

       break;
     }
     case DRAWOP_DRAW_ARC:
       break;
     }
     case DRAWOP_DRAW_ARC:


@@ -595,40 +689,40 @@ wxExpr *wxOpDraw::WritewxExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpDraw::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)

 {
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_DRAW_LINE:
     case DRAWOP_DRAW_RECT:
     case DRAWOP_DRAW_ELLIPSE:
     {
   {
     case DRAWOP_DRAW_LINE:
     case DRAWOP_DRAW_RECT:
     case DRAWOP_DRAW_ELLIPSE:
     {

-      x1 = expr->Nth(1)->RealValue();
-      y1 = expr->Nth(2)->RealValue();
-      x2 = expr->Nth(3)->RealValue();
-      y2 = expr->Nth(4)->RealValue();
+      m_x1 = expr->Nth(1)->RealValue();
+      m_y1 = expr->Nth(2)->RealValue();
+      m_x2 = expr->Nth(3)->RealValue();
+      m_y2 = expr->Nth(4)->RealValue();

       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {
       break;
     }
     case DRAWOP_DRAW_ROUNDED_RECT:
     {

-      x1 = expr->Nth(1)->RealValue();
-      y1 = expr->Nth(2)->RealValue();
-      x2 = expr->Nth(3)->RealValue();
-      y2 = expr->Nth(4)->RealValue();
-      radius = expr->Nth(5)->RealValue();
+      m_x1 = expr->Nth(1)->RealValue();
+      m_y1 = expr->Nth(2)->RealValue();
+      m_x2 = expr->Nth(3)->RealValue();
+      m_y2 = expr->Nth(4)->RealValue();
+      m_radius = expr->Nth(5)->RealValue();

       break;
     }
     case DRAWOP_DRAW_POINT:
     {
       break;
     }
     case DRAWOP_DRAW_POINT:
     {

-      x1 = expr->Nth(1)->RealValue();
-      y1 = expr->Nth(2)->RealValue();
+      m_x1 = expr->Nth(1)->RealValue();
+      m_y1 = expr->Nth(2)->RealValue();

       break;
     }
     case DRAWOP_DRAW_TEXT:
     {
       break;
     }
     case DRAWOP_DRAW_TEXT:
     {

-      x1 = expr->Nth(1)->RealValue();
-      y1 = expr->Nth(2)->RealValue();
-      textString = copystring(expr->Nth(3)->StringValue());
+      m_x1 = expr->Nth(1)->RealValue();
+      m_y1 = expr->Nth(2)->RealValue();
+      m_textString = copystring(expr->Nth(3)->StringValue());

       break;
     }
     case DRAWOP_DRAW_ARC:
       break;
     }
     case DRAWOP_DRAW_ARC:


@@ -646,64 +740,75 @@ void wxOpDraw::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
 
 wxOpPolyDraw::wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints):wxDrawOp(theOp)
 {
 
 wxOpPolyDraw::wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints):wxDrawOp(theOp)
 {

-  noPoints = n;
-  points = thePoints;
+  m_noPoints = n;
+  m_points = thePoints;

 }
 
 wxOpPolyDraw::~wxOpPolyDraw()
 {
 }
 
 wxOpPolyDraw::~wxOpPolyDraw()
 {

-  delete[] points;
+  delete[] m_points;

 }
 
 wxDrawOp *wxOpPolyDraw::Copy(wxPseudoMetaFile *newImage)
 {
 }
 
 wxDrawOp *wxOpPolyDraw::Copy(wxPseudoMetaFile *newImage)
 {

-  wxRealPoint *newPoints = new wxRealPoint[noPoints];
-  for (int i = 0; i < noPoints; i++)
+  wxRealPoint *newPoints = new wxRealPoint[m_noPoints];
+  for (int i = 0; i < m_noPoints; i++)

   {
   {

-    newPoints[i].x = points[i].x;
-    newPoints[i].y = points[i].y;
+    newPoints[i].x = m_points[i].x;
+    newPoints[i].y = m_points[i].y;

   }
   }

-  wxOpPolyDraw *newOp = new wxOpPolyDraw(op, noPoints, newPoints);
+  wxOpPolyDraw *newOp = new wxOpPolyDraw(m_op, m_noPoints, newPoints);

   return newOp;
 }
 
 void wxOpPolyDraw::Do(wxDC& dc, float xoffset, float yoffset)
 {
   return newOp;
 }
 
 void wxOpPolyDraw::Do(wxDC& dc, float xoffset, float yoffset)
 {

-  switch (op)
+  switch (m_op)

   {
     case DRAWOP_DRAW_POLYLINE:
     {
   {
     case DRAWOP_DRAW_POLYLINE:
     {

-        wxPoint *actualPoints = new wxPoint[noPoints];
+        wxPoint *actualPoints = new wxPoint[m_noPoints];

         int i;
         int i;

-        for (i = 0; i < noPoints; i++)
+        for (i = 0; i < m_noPoints; i++)

         {
         {

-            actualPoints[i].x = (long) points[i].x;
-            actualPoints[i].y = (long) points[i].y;
+            actualPoints[i].x = (long) m_points[i].x;
+            actualPoints[i].y = (long) m_points[i].y;

         }
 
         }
 

-        dc.DrawLines(noPoints, actualPoints, xoffset, yoffset);
+        dc.DrawLines(m_noPoints, actualPoints, xoffset, yoffset);

 
         delete[] actualPoints;
         break;
     }
     case DRAWOP_DRAW_POLYGON:
     {
 
         delete[] actualPoints;
         break;
     }
     case DRAWOP_DRAW_POLYGON:
     {

-        wxPoint *actualPoints = new wxPoint[noPoints];
+        wxPoint *actualPoints = new wxPoint[m_noPoints];

         int i;
         int i;

-        for (i = 0; i < noPoints; i++)
+        for (i = 0; i < m_noPoints; i++)

         {
         {

-            actualPoints[i].x = (long) points[i].x;
-            actualPoints[i].y = (long) points[i].y;
+            actualPoints[i].x = (long) m_points[i].x;
+            actualPoints[i].y = (long) m_points[i].y;

         }
 
         }
 

-        dc.DrawPolygon(noPoints, actualPoints, xoffset, yoffset);
+        dc.DrawPolygon(m_noPoints, actualPoints, xoffset, yoffset);

 
         delete[] actualPoints;
         break;
     }
     case DRAWOP_DRAW_SPLINE:
     {
 
         delete[] actualPoints;
         break;
     }
     case DRAWOP_DRAW_SPLINE:
     {

-//      dc.DrawSpline(noPoints, points, xoffset, yoffset);
+        wxPoint *actualPoints = new wxPoint[m_noPoints];
+        int i;
+        for (i = 0; i < m_noPoints; i++)
+        {
+            actualPoints[i].x = (long) m_points[i].x;
+            actualPoints[i].y = (long) m_points[i].y;
+        }
+
+        dc.DrawSpline(m_noPoints, actualPoints); // no offsets in DrawSpline // , xoffset, yoffset);
+
+        delete[] actualPoints;
+        break;

       break;
     }
     default:
       break;
     }
     default:


@@ -713,38 +818,38 @@ void wxOpPolyDraw::Do(wxDC& dc, float xoffset, float yoffset)
 
 void wxOpPolyDraw::Scale(float scaleX, float scaleY)
 {
 
 void wxOpPolyDraw::Scale(float scaleX, float scaleY)
 {

-  for (int i = 0; i < noPoints; i++)
+  for (int i = 0; i < m_noPoints; i++)

   {
   {

-    points[i].x *= scaleX;
-    points[i].y *= scaleY;
+    m_points[i].x *= scaleX;
+    m_points[i].y *= scaleY;

   }
 }
 
 void wxOpPolyDraw::Translate(float x, float y)
 {
   }
 }
 
 void wxOpPolyDraw::Translate(float x, float y)
 {

-  for (int i = 0; i < noPoints; i++)
+  for (int i = 0; i < m_noPoints; i++)

   {
   {

-    points[i].x += x;
-    points[i].y += y;
+    m_points[i].x += x;
+    m_points[i].y += y;

   }
 }
 
 void wxOpPolyDraw::Rotate(float x, float y, float sinTheta, float cosTheta)
 {
   }
 }
 
 void wxOpPolyDraw::Rotate(float x, float y, float sinTheta, float cosTheta)
 {

-  for (int i = 0; i < noPoints; i++)
+  for (int i = 0; i < m_noPoints; i++)

   {
   {

-    float x1 = points[i].x;
-    float y1 = points[i].y;
-    points[i].x = x1*cosTheta - y1*sinTheta + x*(1 - cosTheta) + y*sinTheta;
-    points[i].y = x1*sinTheta + y1*cosTheta + y*(1 - cosTheta) + x*sinTheta;
+    float x1 = m_points[i].x;
+    float y1 = m_points[i].y;
+    m_points[i].x = x1*cosTheta - y1*sinTheta + x*(1 - cosTheta) + y*sinTheta;
+    m_points[i].y = x1*sinTheta + y1*cosTheta + y*(1 - cosTheta) + x*sinTheta;

   }
 }
 
   }
 }
 

-wxExpr *wxOpPolyDraw::WritewxExpr(wxPseudoMetaFile *image)
+wxExpr *wxOpPolyDraw::WriteExpr(wxPseudoMetaFile *image)

 {
   wxExpr *expr = new wxExpr(PrologList);
 {
   wxExpr *expr = new wxExpr(PrologList);

-  expr->Append(new wxExpr((long)op));
-  expr->Append(new wxExpr((long)noPoints));
+  expr->Append(new wxExpr((long)m_op));
+  expr->Append(new wxExpr((long)m_noPoints));

 
 //  char buf1[9];
   char buf2[5];
 
 //  char buf1[9];
   char buf2[5];


@@ -758,10 +863,10 @@ wxExpr *wxOpPolyDraw::WritewxExpr(wxPseudoMetaFile *image)
    *
    */
    
    *
    */
    

-  for (int i = 0; i < noPoints; i++)
+  for (int i = 0; i < m_noPoints; i++)

   {
   {

-    long signedX = (long)(points[i].x*100.0);
-    long signedY = (long)(points[i].y*100.0);
+    long signedX = (long)(m_points[i].x*100.0);
+    long signedY = (long)(m_points[i].y*100.0);

 
     // Scale to 0 -> 64K
     long unSignedX = (long)(signedX + 32767.0);
 
     // Scale to 0 -> 64K
     long unSignedX = (long)(signedX + 32767.0);


@@ -783,18 +888,18 @@ wxExpr *wxOpPolyDraw::WritewxExpr(wxPseudoMetaFile *image)
   return expr;
 }
 
   return expr;
 }
 

-void wxOpPolyDraw::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
+void wxOpPolyDraw::ReadExpr(wxPseudoMetaFile *image, wxExpr *expr)

 {
 {

-  noPoints = (int)expr->Nth(1)->IntegerValue();
+  m_noPoints = (int)expr->Nth(1)->IntegerValue();

 
   char buf1[5];
   char buf2[5];
 
 
   char buf1[5];
   char buf2[5];
 

-  points = new wxRealPoint[noPoints];
+  m_points = new wxRealPoint[m_noPoints];

   int i = 0;
   int bufPtr = 0;
   wxString hexString = expr->Nth(2)->StringValue();
   int i = 0;
   int bufPtr = 0;
   wxString hexString = expr->Nth(2)->StringValue();

-  while (i < noPoints)
+  while (i < m_noPoints)

   {
     buf1[0] = hexString[bufPtr];
     buf1[1] = hexString[bufPtr + 1];
   {
     buf1[0] = hexString[bufPtr];
     buf1[1] = hexString[bufPtr + 1];


@@ -822,8 +927,8 @@ void wxOpPolyDraw::ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr)
     int testY = (signed int)unSignedY;
 #endif
 
     int testY = (signed int)unSignedY;
 #endif
 

-    points[i].x = (float)(signedX / 100.0);
-    points[i].y = (float)(signedY / 100.0);
+    m_points[i].x = (float)(signedX / 100.0);
+    m_points[i].y = (float)(signedY / 100.0);

 
     i ++;
   }
 
     i ++;
   }


@@ -920,6 +1025,8 @@ wxPseudoMetaFile::wxPseudoMetaFile()
   m_rotateable = TRUE;
   m_width = 0.0;
   m_height = 0.0;
   m_rotateable = TRUE;
   m_width = 0.0;
   m_height = 0.0;

+  m_outlinePen = NULL;
+  m_fillBrush = NULL;

 }
 
 wxPseudoMetaFile::wxPseudoMetaFile(wxPseudoMetaFile& mf)
 }
 
 wxPseudoMetaFile::wxPseudoMetaFile(wxPseudoMetaFile& mf)


@@ -943,6 +1050,8 @@ void wxPseudoMetaFile::Clear()
   }
   m_ops.Clear();
   m_gdiObjects.Clear();
   }
   m_ops.Clear();
   m_gdiObjects.Clear();

+  m_outlineColours.Clear();
+  m_fillColours.Clear();

 }
 
 void wxPseudoMetaFile::Draw(wxDC& dc, float xoffset, float yoffset)
 }
 
 void wxPseudoMetaFile::Draw(wxDC& dc, float xoffset, float yoffset)


@@ -1071,7 +1180,7 @@ void wxPseudoMetaFile::WritePrologAttributes(wxExpr *clause)
   {
     sprintf(buf, "op%d", i);
     wxDrawOp *op = (wxDrawOp *)node->Data();
   {
     sprintf(buf, "op%d", i);
     wxDrawOp *op = (wxDrawOp *)node->Data();

-    wxExpr *expr = op->WritewxExpr(this);
+    wxExpr *expr = op->WriteExpr(this);

     if (expr)
     {
       clause->AddAttributeValue(buf, expr);
     if (expr)
     {
       clause->AddAttributeValue(buf, expr);


@@ -1208,7 +1317,7 @@ void wxPseudoMetaFile::ReadPrologAttributes(wxExpr *clause)
         case DRAWOP_SET_BK_MODE:
         {
           wxOpSetGDI *theOp = new wxOpSetGDI(opId, this, 0);
         case DRAWOP_SET_BK_MODE:
         {
           wxOpSetGDI *theOp = new wxOpSetGDI(opId, this, 0);

-          theOp->ReadwxExpr(this, expr);
+          theOp->ReadExpr(this, expr);

           m_ops.Append(theOp);
           break;
         }
           m_ops.Append(theOp);
           break;
         }


@@ -1217,7 +1326,7 @@ void wxPseudoMetaFile::ReadPrologAttributes(wxExpr *clause)
         case DRAWOP_DESTROY_CLIPPING_RECT:
         {
           wxOpSetClipping *theOp = new wxOpSetClipping(opId, 0.0, 0.0, 0.0, 0.0);
         case DRAWOP_DESTROY_CLIPPING_RECT:
         {
           wxOpSetClipping *theOp = new wxOpSetClipping(opId, 0.0, 0.0, 0.0, 0.0);

-          theOp->ReadwxExpr(this, expr);
+          theOp->ReadExpr(this, expr);

           m_ops.Append(theOp);
           break;
         }
           m_ops.Append(theOp);
           break;
         }


@@ -1231,7 +1340,7 @@ void wxPseudoMetaFile::ReadPrologAttributes(wxExpr *clause)
         case DRAWOP_DRAW_TEXT:
         {
           wxOpDraw *theOp = new wxOpDraw(opId, 0.0, 0.0, 0.0, 0.0);
         case DRAWOP_DRAW_TEXT:
         {
           wxOpDraw *theOp = new wxOpDraw(opId, 0.0, 0.0, 0.0, 0.0);

-          theOp->ReadwxExpr(this, expr);
+          theOp->ReadExpr(this, expr);

           m_ops.Append(theOp);
           break;
         }
           m_ops.Append(theOp);
           break;
         }


@@ -1240,7 +1349,7 @@ void wxPseudoMetaFile::ReadPrologAttributes(wxExpr *clause)
         case DRAWOP_DRAW_POLYGON:
         {
           wxOpPolyDraw *theOp = new wxOpPolyDraw(opId, 0, NULL);
         case DRAWOP_DRAW_POLYGON:
         {
           wxOpPolyDraw *theOp = new wxOpPolyDraw(opId, 0, NULL);

-          theOp->ReadwxExpr(this, expr);
+          theOp->ReadExpr(this, expr);

           m_ops.Append(theOp);
           break;
         }
           m_ops.Append(theOp);
           break;
         }


@@ -1282,6 +1391,10 @@ void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
   copy.m_width = m_width;
   copy.m_height = m_height;
   copy.m_rotateable = m_rotateable;
   copy.m_width = m_width;
   copy.m_height = m_height;
   copy.m_rotateable = m_rotateable;

+  copy.m_fillBrush = m_fillBrush;
+  copy.m_outlinePen = m_outlinePen;
+
+  copy.Clear();

 
   // Copy the GDI objects
   wxNode *node = m_gdiObjects.First();
 
   // Copy the GDI objects
   wxNode *node = m_gdiObjects.First();


@@ -1302,14 +1415,12 @@ void wxPseudoMetaFile::Copy(wxPseudoMetaFile& copy)
   }
 
   // Copy the outline/fill operations
   }
 
   // Copy the outline/fill operations

-  copy.m_outlineColours.Clear();

   node = m_outlineColours.First();
   while (node)
   {
     copy.m_outlineColours.Append((wxObject *)node->Data());
     node = node->Next();
   }
   node = m_outlineColours.First();
   while (node)
   {
     copy.m_outlineColours.Append((wxObject *)node->Data());
     node = node->Next();
   }

-  copy.m_fillColours.Clear();

   node = m_fillColours.First();
   while (node)
   {
   node = m_fillColours.First();
   while (node)
   {


@@ -1350,9 +1461,9 @@ bool wxPseudoMetaFile::LoadFromMetaFile(char *filename, float *rwidth, float *rh
       case META_SETBKCOLOR:
       {
         wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_BK_COLOUR, this, 0);
       case META_SETBKCOLOR:
       {
         wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_BK_COLOUR, this, 0);

-        op->r = (unsigned char)record->param1;
-        op->g = (unsigned char)record->param2;
-        op->b = (unsigned char)record->param3;
+        op->m_r = (unsigned char)record->param1;
+        op->m_g = (unsigned char)record->param2;
+        op->m_b = (unsigned char)record->param3;

         m_ops.Append(op);
         break;
       }
         m_ops.Append(op);
         break;
       }


@@ -1374,9 +1485,9 @@ bool wxPseudoMetaFile::LoadFromMetaFile(char *filename, float *rwidth, float *rh
       case META_SETTEXTCOLOR:
       {
         wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_TEXT_COLOUR, this, 0);
       case META_SETTEXTCOLOR:
       {
         wxOpSetGDI *op = new wxOpSetGDI(DRAWOP_SET_TEXT_COLOUR, this, 0);

-        op->r = (unsigned char)record->param1;
-        op->g = (unsigned char)record->param2;
-        op->b = (unsigned char)record->param3;
+        op->m_r = (unsigned char)record->param1;
+        op->m_g = (unsigned char)record->param2;
+        op->m_b = (unsigned char)record->param3;

         m_ops.Append(op);
         break;
       }
         m_ops.Append(op);
         break;
       }


@@ -1406,7 +1517,7 @@ bool wxPseudoMetaFile::LoadFromMetaFile(char *filename, float *rwidth, float *rh
       {
 /*
         wxMetaRecord *rec = new wxMetaRecord(META_EXCLUDECLIPRECT);
       {
 /*
         wxMetaRecord *rec = new wxMetaRecord(META_EXCLUDECLIPRECT);

-        rec->param4 = getshort(handle); // y2
+        rec->param4 = getshort(handle); // m_y2

         rec->param3 = getshort(handle); // x2
         rec->param2 = getshort(handle); // y1
         rec->param1 = getshort(handle); // x1
         rec->param3 = getshort(handle); // x2
         rec->param2 = getshort(handle); // y1
         rec->param1 = getshort(handle); // x1


@@ -1416,7 +1527,7 @@ bool wxPseudoMetaFile::LoadFromMetaFile(char *filename, float *rwidth, float *rh
       case META_INTERSECTCLIPRECT:
       {
 /*
       case META_INTERSECTCLIPRECT:
       {
 /*

-        rec->param4 = getshort(handle); // y2
+        rec->param4 = getshort(handle); // m_y2

         rec->param3 = getshort(handle); // x2
         rec->param2 = getshort(handle); // y1
         rec->param1 = getshort(handle); // x1
         rec->param3 = getshort(handle); // x2
         rec->param2 = getshort(handle); // y1
         rec->param1 = getshort(handle); // x1


@@ -1695,7 +1806,7 @@ void wxPseudoMetaFile::GetBounds(float *boundMinX, float *boundMinY, float *boun
   while (node)
   {
     wxDrawOp *op = (wxDrawOp *)node->Data();
   while (node)
   {
     wxDrawOp *op = (wxDrawOp *)node->Data();

-    switch (op->op)
+    switch (op->GetOp())

     {
       case DRAWOP_DRAW_LINE:
       case DRAWOP_DRAW_RECT:
     {
       case DRAWOP_DRAW_LINE:
       case DRAWOP_DRAW_RECT:


@@ -1706,25 +1817,25 @@ void wxPseudoMetaFile::GetBounds(float *boundMinX, float *boundMinY, float *boun
       case DRAWOP_DRAW_TEXT:
       {
         wxOpDraw *opDraw = (wxOpDraw *)op;
       case DRAWOP_DRAW_TEXT:
       {
         wxOpDraw *opDraw = (wxOpDraw *)op;

-        if (opDraw->x1 < minX) minX = opDraw->x1;
-        if (opDraw->x1 > maxX) maxX = opDraw->x1;
-        if (opDraw->y1 < minY) minY = opDraw->y1;
-        if (opDraw->y1 > maxY) maxY = opDraw->y1;
-        if (op->op == DRAWOP_DRAW_LINE)
+        if (opDraw->m_x1 < minX) minX = opDraw->m_x1;
+        if (opDraw->m_x1 > maxX) maxX = opDraw->m_x1;
+        if (opDraw->m_y1 < minY) minY = opDraw->m_y1;
+        if (opDraw->m_y1 > maxY) maxY = opDraw->m_y1;
+        if (op->GetOp() == DRAWOP_DRAW_LINE)

         {
         {

-          if (opDraw->x2 < minX) minX = opDraw->x2;
-          if (opDraw->x2 > maxX) maxX = opDraw->x2;
-          if (opDraw->y2 < minY) minY = opDraw->y2;
-          if (opDraw->y2 > maxY) maxY = opDraw->y2;
+          if (opDraw->m_x2 < minX) minX = opDraw->m_x2;
+          if (opDraw->m_x2 > maxX) maxX = opDraw->m_x2;
+          if (opDraw->m_y2 < minY) minY = opDraw->m_y2;
+          if (opDraw->m_y2 > maxY) maxY = opDraw->m_y2;

         }
         }

-        else if (op->op == DRAWOP_DRAW_RECT ||
-                 op->op == DRAWOP_DRAW_ROUNDED_RECT ||
-                 op->op == DRAWOP_DRAW_ELLIPSE)
+        else if (op->GetOp() == DRAWOP_DRAW_RECT ||
+                 op->GetOp() == DRAWOP_DRAW_ROUNDED_RECT ||
+                 op->GetOp() == DRAWOP_DRAW_ELLIPSE)

         {
         {

-          if ((opDraw->x1 + opDraw->x2) < minX) minX = (opDraw->x1 + opDraw->x2);
-          if ((opDraw->x1 + opDraw->x2) > maxX) maxX = (opDraw->x1 + opDraw->x2);
-          if ((opDraw->y1 + opDraw->y2) < minY) minY = (opDraw->y1 + opDraw->y2);
-          if ((opDraw->y1 + opDraw->y2) > maxY) maxY = (opDraw->y1 + opDraw->y2);
+          if ((opDraw->m_x1 + opDraw->m_x2) < minX) minX = (opDraw->m_x1 + opDraw->m_x2);
+          if ((opDraw->m_x1 + opDraw->m_x2) > maxX) maxX = (opDraw->m_x1 + opDraw->m_x2);
+          if ((opDraw->m_y1 + opDraw->m_y2) < minY) minY = (opDraw->m_y1 + opDraw->m_y2);
+          if ((opDraw->m_y1 + opDraw->m_y2) > maxY) maxY = (opDraw->m_y1 + opDraw->m_y2);

         }
         break;
       }
         }
         break;
       }


@@ -1733,12 +1844,12 @@ void wxPseudoMetaFile::GetBounds(float *boundMinX, float *boundMinY, float *boun
       case DRAWOP_DRAW_SPLINE:
       {
         wxOpPolyDraw *poly = (wxOpPolyDraw *)op;
       case DRAWOP_DRAW_SPLINE:
       {
         wxOpPolyDraw *poly = (wxOpPolyDraw *)op;

-        for (int i = 0; i < poly->noPoints; i++)
+        for (int i = 0; i < poly->m_noPoints; i++)

         {
         {

-          if (poly->points[i].x < minX) minX = poly->points[i].x;
-          if (poly->points[i].x > maxX) maxX = poly->points[i].x;
-          if (poly->points[i].y < minY) minY = poly->points[i].y;
-          if (poly->points[i].y > maxY) maxY = poly->points[i].y;
+          if (poly->m_points[i].x < minX) minX = poly->m_points[i].x;
+          if (poly->m_points[i].x > maxX) maxX = poly->m_points[i].x;
+          if (poly->m_points[i].y < minY) minY = poly->m_points[i].y;
+          if (poly->m_points[i].y > maxY) maxY = poly->m_points[i].y;

         }
         break;
       }
         }
         break;
       }


@@ -1758,4 +1869,195 @@ void wxPseudoMetaFile::GetBounds(float *boundMinX, float *boundMinY, float *boun
 */
 }
 
 */
 }
 

+// Calculate size from current operations
+void wxPseudoMetaFile::CalculateSize(wxDrawnShape* shape)
+{
+  float boundMinX, boundMinY, boundMaxX, boundMaxY;
+
+  GetBounds(& boundMinX, & boundMinY, & boundMaxX, & boundMaxY);
+
+  SetSize(boundMaxX - boundMinX, boundMaxY - boundMinY);
+
+  if (shape)
+  {
+    shape->SetWidth(m_width);
+    shape->SetHeight(m_height);
+  }
+}
+
+// Set of functions for drawing into a pseudo metafile.
+// They use integers, but doubles are used internally for accuracy
+// when scaling.
+
+void wxPseudoMetaFile::DrawLine(const wxPoint& pt1, const wxPoint& pt2)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_LINE,
+          (double) pt1.x, (double) pt1.y, (double) pt2.x, (double) pt2.y);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawRectangle(const wxRect& rect)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_RECT,
+          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawRoundedRectangle(const wxRect& rect, double radius)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ROUNDED_RECT,
+          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
+
+    theOp->m_radius = radius;
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawEllipse(const wxRect& rect)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_ELLIPSE,
+          (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawPoint(const wxPoint& pt)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_POINT,
+          (double) pt.x, (double) pt.y, 0.0, 0.0);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawText(const wxString& text, const wxPoint& pt)
+{
+    wxOpDraw *theOp = new wxOpDraw(DRAWOP_DRAW_TEXT,
+          (double) pt.x, (double) pt.y, 0.0, 0.0);
+
+    theOp->m_textString = copystring(text);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawLines(int n, wxPoint pts[])
+{
+    wxRealPoint* realPoints = new wxRealPoint[n];
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        realPoints[i].x = pts[i].x;
+        realPoints[i].y = pts[i].y;
+    }
+    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_POLYLINE, n, realPoints);
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawPolygon(int n, wxPoint pts[])
+{
+    wxRealPoint* realPoints = new wxRealPoint[n];
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        realPoints[i].x = pts[i].x;
+        realPoints[i].y = pts[i].y;
+    }
+    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_POLYGON, n, realPoints);
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::DrawSpline(int n, wxPoint pts[])
+{
+    wxRealPoint* realPoints = new wxRealPoint[n];
+    int i;
+    for (i = 0; i < n; i++)
+    {
+        realPoints[i].x = pts[i].x;
+        realPoints[i].y = pts[i].y;
+    }
+    wxOpPolyDraw* theOp = new wxOpPolyDraw(DRAWOP_DRAW_SPLINE, n, realPoints);
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::SetClippingRect(const wxRect& rect)
+{
+    wxOpSetClipping* theOp = new wxOpSetClipping(DRAWOP_SET_CLIPPING_RECT,
+        (double) rect.x, (double) rect.y, (double) rect.width, (double) rect.height);
+}
+
+void wxPseudoMetaFile::DestroyClippingRect()
+{
+    wxOpSetClipping* theOp = new wxOpSetClipping(DRAWOP_DESTROY_CLIPPING_RECT,
+        0.0, 0.0, 0.0, 0.0);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::SetPen(wxPen* pen, bool isOutline)
+{
+    m_gdiObjects.Append(pen);
+    int n = m_gdiObjects.Number();
+
+    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_PEN, this, n - 1);
+
+    m_ops.Append(theOp);
+
+    if (isOutline)
+    {
+        m_outlineColours.Append((wxObject*) (n - 1));
+    }
+}
+
+void wxPseudoMetaFile::SetBrush(wxBrush* brush, bool isFill)
+{
+    m_gdiObjects.Append(brush);
+    int n = m_gdiObjects.Number();
+
+    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BRUSH, this, n - 1);
+
+    m_ops.Append(theOp);
+
+    if (isFill)
+    {
+        m_fillColours.Append((wxObject*) (n - 1));
+    }
+}
+
+void wxPseudoMetaFile::SetFont(wxFont* font)
+{
+    m_gdiObjects.Append(font);
+    int n = m_gdiObjects.Number();
+
+    wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_FONT, this, n - 1);
+
+    m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::SetTextColour(const wxColour& colour)
+{
+   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_TEXT_COLOUR, this, 0);
+   theOp->m_r = colour.Red();
+   theOp->m_g = colour.Green();
+   theOp->m_b = colour.Blue();
+
+   m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::SetBackgroundColour(const wxColour& colour)
+{
+   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BK_COLOUR, this, 0);
+   theOp->m_r = colour.Red();
+   theOp->m_g = colour.Green();
+   theOp->m_b = colour.Blue();
+
+   m_ops.Append(theOp);
+}
+
+void wxPseudoMetaFile::SetBackgroundMode(int mode)
+{
+   wxOpSetGDI* theOp = new wxOpSetGDI(DRAWOP_SET_BK_MODE, this, 0, mode);
+
+   m_ops.Append(theOp);
+}

 
 

diff --git a/utils/ogl/src/drawn.h b/utils/ogl/src/drawn.h
index cf079e1d3acf8db19be8935b4f77a933fdce8048..7387983d77ff04db8171f96938a8691540e7d8d4 100644 (file)
--- a/utils/ogl/src/drawn.h
+++ b/utils/ogl/src/drawn.h
@@ -18,6 +18,7 @@
 
 #include "basic.h"
 
 
 #include "basic.h"
 

+class wxDrawnShape;

 class wxPseudoMetaFile: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)
 class wxPseudoMetaFile: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxPseudoMetaFile)


@@ -48,11 +49,47 @@ class wxPseudoMetaFile: public wxObject
 
   void GetBounds(float *minX, float *minY, float *maxX, float *maxY);
 
 
   void GetBounds(float *minX, float *minY, float *maxX, float *maxY);
 

+  // Calculate size from current operations
+  void CalculateSize(wxDrawnShape* shape);
+

   inline wxList& GetOutlineColours() const { return (wxList&) m_outlineColours; }
   inline wxList& GetFillColours() const { return (wxList&) m_fillColours; }
   inline void SetRotateable(bool rot) { m_rotateable = rot; }
   inline bool GetRotateable() const { return m_rotateable; }
 
   inline wxList& GetOutlineColours() const { return (wxList&) m_outlineColours; }
   inline wxList& GetFillColours() const { return (wxList&) m_fillColours; }
   inline void SetRotateable(bool rot) { m_rotateable = rot; }
   inline bool GetRotateable() const { return m_rotateable; }
 

+  inline void SetSize(float w, float h) { m_width = w; m_height = h; }
+
+  inline void SetFillBrush(wxBrush* brush) { m_fillBrush = brush; }
+  inline wxBrush* GetFillBrush() const { return m_fillBrush; }
+
+  inline void SetOutlinePen(wxPen* pen) { m_outlinePen = pen; }
+  inline wxPen* GetOutlinePen() const { return m_outlinePen; }
+
+public:
+  /// Set of functions for drawing into a pseudo metafile.
+  /// They use integers, but doubles are used internally for accuracy
+  /// when scaling.
+
+  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+  virtual void DrawRectangle(const wxRect& rect);
+  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
+  virtual void DrawEllipse(const wxRect& rect);
+  virtual void DrawPoint(const wxPoint& pt);
+  virtual void DrawText(const wxString& text, const wxPoint& pt);
+  virtual void DrawLines(int n, wxPoint pts[]);
+  virtual void DrawPolygon(int n, wxPoint pts[]);
+  virtual void DrawSpline(int n, wxPoint pts[]);
+
+  virtual void SetClippingRect(const wxRect& rect);
+  virtual void DestroyClippingRect();
+
+  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetFont(wxFont* font);
+  virtual void SetTextColour(const wxColour& colour);
+  virtual void SetBackgroundColour(const wxColour& colour);
+  virtual void SetBackgroundMode(int mode);
+

 public:
   bool              m_rotateable;
   float             m_width;
 public:
   bool              m_rotateable;
   float             m_width;


@@ -102,13 +139,40 @@ class wxDrawnShape: public wxRectangleShape
   inline void SetSaveToFile(bool save) { m_saveToFile = save; }
   inline wxPseudoMetaFile& GetMetaFile() const { return (wxPseudoMetaFile&) m_metafile; }
 
   inline void SetSaveToFile(bool save) { m_saveToFile = save; }
   inline wxPseudoMetaFile& GetMetaFile() const { return (wxPseudoMetaFile&) m_metafile; }
 

+  /// Set of functions for drawing into a pseudo metafile.
+  /// They use integers, but doubles are used internally for accuracy
+  /// when scaling.
+
+  virtual void DrawLine(const wxPoint& pt1, const wxPoint& pt2);
+  virtual void DrawRectangle(const wxRect& rect);
+  virtual void DrawRoundedRectangle(const wxRect& rect, double radius);
+  virtual void DrawEllipse(const wxRect& rect);
+  virtual void DrawPoint(const wxPoint& pt);
+  virtual void DrawText(const wxString& text, const wxPoint& pt);
+  virtual void DrawLines(int n, wxPoint pts[]);
+  virtual void DrawPolygon(int n, wxPoint pts[]);
+  virtual void DrawSpline(int n, wxPoint pts[]);
+
+  virtual void SetClippingRect(const wxRect& rect);
+  virtual void DestroyClippingRect();
+
+  virtual void SetPen(wxPen* pen, bool isOutline = FALSE);     // TODO: eventually, just store GDI object attributes, not actual
+  virtual void SetBrush(wxBrush* brush, bool isFill = FALSE);  // pens/brushes etc.
+  virtual void SetFont(wxFont* font);
+  virtual void SetTextColour(const wxColour& colour);
+  virtual void SetBackgroundColour(const wxColour& colour);
+  virtual void SetBackgroundMode(int mode);
+
+  // Set the width/height according to the shapes in the metafile.
+  // Call this after drawing into the shape.
+  inline void CalculateSize() { m_metafile.CalculateSize(this); }
+

 private:
   wxPseudoMetaFile      m_metafile;
 
   // Don't save all wxDrawnShape metafiles to file: sometimes
   // we take the metafile data from a symbol library.
   bool                  m_saveToFile;
 private:
   wxPseudoMetaFile      m_metafile;
 
   // Don't save all wxDrawnShape metafiles to file: sometimes
   // we take the metafile data from a symbol library.
   bool                  m_saveToFile;

-

 };
 
 #endif
 };
 
 #endif

diff --git a/utils/ogl/src/drawnp.h b/utils/ogl/src/drawnp.h
index a08aef7bb5793bbcd803c2d5c39ba45024b20287..dddd89e470bdb07e3e4aa43ac0d15db094c185e8 100644 (file)
--- a/utils/ogl/src/drawnp.h
+++ b/utils/ogl/src/drawnp.h
@@ -56,18 +56,22 @@
  
 class wxDrawOp: public wxObject
 {
  
 class wxDrawOp: public wxObject
 {

- public:
-  int op;
-
-  inline wxDrawOp(int theOp) { op = theOp; }
+public:
+  inline wxDrawOp(int theOp) { m_op = theOp; }

   inline ~wxDrawOp() {}
   inline virtual void Scale(float xScale, float yScale) {};
   inline virtual void Translate(float x, float y) {};
   inline virtual void Rotate(float x, float y, float sinTheta, float cosTheta) {};
   virtual void Do(wxDC& dc, float xoffset, float yoffset) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
   inline ~wxDrawOp() {}
   inline virtual void Scale(float xScale, float yScale) {};
   inline virtual void Translate(float x, float y) {};
   inline virtual void Rotate(float x, float y, float sinTheta, float cosTheta) {};
   virtual void Do(wxDC& dc, float xoffset, float yoffset) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;

-  virtual wxExpr *WritewxExpr(wxPseudoMetaFile *image) = 0;
-  virtual void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
+  virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
+  virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
+
+  int GetOp() const { return m_op; }
+
+protected:
+  int m_op;
+

 };
 
 /*
 };
 
 /*


@@ -78,17 +82,19 @@ class wxDrawOp: public wxObject
 class wxOpSetGDI: public wxDrawOp
 {
  public:
 class wxOpSetGDI: public wxDrawOp
 {
  public:

-  int mode;
-  int gdiIndex;
-  wxPseudoMetaFile *image;
-  unsigned char r;
-  unsigned char g;
-  unsigned char b;

   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
   void Do(wxDC& dc, float xoffset, float yoffset);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
   void Do(wxDC& dc, float xoffset, float yoffset);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  int               m_mode;
+  int               m_gdiIndex;
+  wxPseudoMetaFile* m_image;
+  unsigned char     m_r;
+  unsigned char     m_g;
+  unsigned char     m_b;

 };
 
 /*
 };
 
 /*


@@ -98,18 +104,20 @@ class wxOpSetGDI: public wxDrawOp
  
 class wxOpSetClipping: public wxDrawOp
 {
  
 class wxOpSetClipping: public wxDrawOp
 {

- public:
-  float x1;
-  float y1;
-  float x2;
-  float y2;
+public:

   wxOpSetClipping(int theOp, float theX1, float theY1, float theX2, float theY2);
   void Do(wxDC& dc, float xoffset, float yoffset);
   void Scale(float xScale, float yScale);
   void Translate(float x, float y);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxOpSetClipping(int theOp, float theX1, float theY1, float theX2, float theY2);
   void Do(wxDC& dc, float xoffset, float yoffset);
   void Scale(float xScale, float yScale);
   void Translate(float x, float y);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  float     m_x1;
+  float     m_y1;
+  float     m_x2;
+  float     m_y2;

 };
 
 /*
 };
 
 /*


@@ -120,14 +128,6 @@ class wxOpSetClipping: public wxDrawOp
 class wxOpDraw: public wxDrawOp
 {
  public:
 class wxOpDraw: public wxDrawOp
 {
  public:

-  float x1;
-  float y1;
-  float x2;
-  float y2;
-  float x3;
-  float radius;
-  char *textString;
-

   wxOpDraw(int theOp, float theX1, float theY1, float theX2, float theY2,
          float radius = 0.0, char *s = NULL);
   ~wxOpDraw();
   wxOpDraw(int theOp, float theX1, float theY1, float theX2, float theY2,
          float radius = 0.0, char *s = NULL);
   ~wxOpDraw();


@@ -136,8 +136,18 @@ class wxOpDraw: public wxDrawOp
   void Translate(float x, float y);
   void Rotate(float x, float y, float sinTheta, float cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   void Translate(float x, float y);
   void Rotate(float x, float y, float sinTheta, float cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  float     m_x1;
+  float     m_y1;
+  float     m_x2;
+  float     m_y2;
+  float     m_x3;
+  float     m_radius;
+  char*     m_textString;
+

 };
 
 /*
 };
 
 /*


@@ -147,10 +157,7 @@ class wxOpDraw: public wxDrawOp
 
 class wxOpPolyDraw: public wxDrawOp
 {
 
 class wxOpPolyDraw: public wxDrawOp
 {

- public:
-  wxRealPoint *points;
-  int noPoints;
-  
+public:

   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
   ~wxOpPolyDraw();
   void Do(wxDC& dc, float xoffset, float yoffset);
   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
   ~wxOpPolyDraw();
   void Do(wxDC& dc, float xoffset, float yoffset);


@@ -158,8 +165,13 @@ class wxOpPolyDraw: public wxDrawOp
   void Translate(float x, float y);
   void Rotate(float x, float y, float sinTheta, float cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   void Translate(float x, float y);
   void Rotate(float x, float y, float sinTheta, float cosTheta);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  wxRealPoint*  m_points;
+  int           m_noPoints;
+  

 };
 
 #endif
 };
 
 #endif

diff --git a/utils/ogl/src/lines.cpp b/utils/ogl/src/lines.cpp
index 34216779cf3fd227526605e7d8d85907a90a4882..08647fe33699a88318bf5c14b5c052a0815a6e86 100644 (file)
--- a/utils/ogl/src/lines.cpp
+++ b/utils/ogl/src/lines.cpp
@@ -1650,7 +1650,7 @@ void wxLineShape::Copy(wxShape& copy)
 // Override select, to create/delete temporary label-moving objects
 void wxLineShape::Select(bool select, wxDC* dc)
 {
 // Override select, to create/delete temporary label-moving objects
 void wxLineShape::Select(bool select, wxDC* dc)
 {

-  wxShape::Select(select);
+  wxShape::Select(select, dc);

   if (select)
   {
     for (int i = 0; i < 3; i++)
   if (select)
   {
     for (int i = 0; i < 3; i++)

diff --git a/utils/ogl/src/lines.h b/utils/ogl/src/lines.h
index 29388bb8231aab75d1e1c063a6569ff876c3f324..567150394240729c77bef015272487444857d064 100644 (file)
--- a/utils/ogl/src/lines.h
+++ b/utils/ogl/src/lines.h
@@ -58,6 +58,7 @@ class wxArrowHead: public wxObject
 
   inline WXTYPE _GetType() const { return m_arrowType; }
   inline int GetPosition() const { return m_arrowEnd; }
 
   inline WXTYPE _GetType() const { return m_arrowType; }
   inline int GetPosition() const { return m_arrowEnd; }

+  inline void SetPosition(int pos) { m_arrowEnd = pos; }

   inline float GetXOffset() const { return m_xOffset; }
   inline float GetYOffset() const { return m_yOffset; }
   inline float GetSpacing() const { return m_spacing; }
   inline float GetXOffset() const { return m_xOffset; }
   inline float GetYOffset() const { return m_yOffset; }
   inline float GetSpacing() const { return m_spacing; }


@@ -200,7 +201,7 @@ class wxLineShape: public wxShape
   // Does the copying for this object
   void Copy(wxShape& copy);
 
   // Does the copying for this object
   void Copy(wxShape& copy);
 

-  // New OGL stuff
+  // Add an arrowhead.

   wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
                 float arrowSize = 10.0, float xOffset = 0.0, const wxString& name = "",
                 wxPseudoMetaFile *mf = NULL, long arrowId = -1);
   wxArrowHead *AddArrow(WXTYPE type, int end = ARROW_POSITION_END,
                 float arrowSize = 10.0, float xOffset = 0.0, const wxString& name = "",
                 wxPseudoMetaFile *mf = NULL, long arrowId = -1);


@@ -226,6 +227,7 @@ class wxLineShape: public wxShape
   bool DeleteArrowHead(long arrowId);
   void DrawArrow(wxDC& dc, wxArrowHead *arrow, float xOffset, bool proportionalOffset);
   inline void SetIgnoreOffsets(bool ignore) { m_ignoreArrowOffsets = ignore; }
   bool DeleteArrowHead(long arrowId);
   void DrawArrow(wxDC& dc, wxArrowHead *arrow, float xOffset, bool proportionalOffset);
   inline void SetIgnoreOffsets(bool ignore) { m_ignoreArrowOffsets = ignore; }

+  inline wxList& GetArrows() const { return (wxList&) m_arcArrows; }

 
   // Find horizontal width for drawing a line with
   // arrows in minimum space. Assume arrows at
 
   // Find horizontal width for drawing a line with
   // arrows in minimum space. Assume arrows at

diff --git a/utils/ogl/src/misc.cpp b/utils/ogl/src/misc.cpp
index 1c51a7783d9f8e25a93e4cd0a77c8f5047b2bce9..b1cbe4908ef4e3d7abb361733da6957cc5464719 100644 (file)
--- a/utils/ogl/src/misc.cpp
+++ b/utils/ogl/src/misc.cpp
@@ -62,7 +62,7 @@ void wxOGLInitialize()
 {
   GraphicsBullseyeCursor = new wxCursor(wxCURSOR_BULLSEYE);
 
 {
   GraphicsBullseyeCursor = new wxCursor(wxCURSOR_BULLSEYE);
 

-  g_oglNormalFont = new wxFont(12, wxMODERN, wxNORMAL, wxNORMAL);
+  g_oglNormalFont = new wxFont(10, wxSWISS, wxNORMAL, wxNORMAL);

 
   black_pen = new wxPen("BLACK", 1, wxSOLID);
 
 
   black_pen = new wxPen("BLACK", 1, wxSOLID);
 


@@ -834,4 +834,71 @@ void UpdateListBox(wxListBox *item, wxList *list)
   }
 }
 
   }
 }
 

+/*
+ * Hex<->Dec conversion
+ */
+
+// Array used in DecToHex conversion routine.
+static char sg_HexArray[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
+  'C', 'D', 'E', 'F' };
+
+// Convert 2-digit hex number to decimal
+unsigned int oglHexToDec(char* buf)
+{
+  int firstDigit, secondDigit;
+  
+  if (buf[0] >= 'A')
+    firstDigit = buf[0] - 'A' + 10;
+  else
+    firstDigit = buf[0] - '0';
+
+  if (buf[1] >= 'A')
+    secondDigit = buf[1] - 'A' + 10;
+  else
+    secondDigit = buf[1] - '0';
+    
+  return firstDigit * 16 + secondDigit;
+}
+
+// Convert decimal integer to 2-character hex string
+void oglDecToHex(unsigned int dec, char *buf)
+{
+    int firstDigit = (int)(dec/16.0);
+    int secondDigit = (int)(dec - (firstDigit*16.0));
+    buf[0] = sg_HexArray[firstDigit];
+    buf[1] = sg_HexArray[secondDigit];
+    buf[2] = 0;
+}
+
+// 3-digit hex to wxColour
+wxColour oglHexToColour(const wxString& hex)
+{
+    if (hex.Length() == 6)
+       {
+        char buf[7];
+        strncpy(buf, hex, 7);
+        unsigned int r = oglHexToDec((char *)buf);
+        unsigned int g = oglHexToDec((char *)(buf+2));
+        unsigned int b = oglHexToDec((char *)(buf+4));
+        return wxColour(r, g, b);
+       }
+       else
+           return wxColour(0,0,0);
+}
+
+// RGB to 3-digit hex
+wxString oglColourToHex(const wxColour& colour)
+{
+    char buf[7];
+    unsigned int red = colour.Red();
+    unsigned int green = colour.Green();
+    unsigned int blue = colour.Blue();
+
+    oglDecToHex(red, buf);
+    oglDecToHex(green, buf+2);
+    oglDecToHex(blue, buf+4);
+
+    return wxString(buf);
+}
+

 
 

diff --git a/utils/ogl/src/misc.h b/utils/ogl/src/misc.h
index fb4ca0144b337c984e24d600ffc512bb26428da8..63ee93c1662a3c64907f3dc0e8dbb78d665b8b38 100644 (file)
--- a/utils/ogl/src/misc.h
+++ b/utils/ogl/src/misc.h
@@ -103,5 +103,11 @@ extern wxCursor *GraphicsBullseyeCursor;
 
 extern wxFont *MatchFont(int point_size);
 
 
 extern wxFont *MatchFont(int point_size);
 

+extern wxString oglColourToHex(const wxColour& colour);
+extern wxColour oglHexToColour(const wxString& hex);
+extern void oglDecToHex(unsigned int dec, char *buf);
+extern unsigned int oglHexToDec(char* buf);
+
+

 #endif
  // _OGL_MISC_H_
 #endif
  // _OGL_MISC_H_