Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/symbols.txt
View File

@@ -4,11 +4,11 @@ GUIs:
----- -----
__X__ any X, but not GTK __X__ any X, but not GTK
__MOTIF__ Motif __WXMOTIF__ Motif
__XT__ Xt; mutually exclusive with WX_MOTIF (?) __XT__ Xt; mutually exclusive with WX_MOTIF (?)
__GTK__ GTK __WXGTK__ GTK
__XVIEW__ Obsolete! __XVIEW__ Obsolete!
__WINDOWS__ Any Windows __WXMSW__ Any Windows
__MAC__ MacOS __MAC__ MacOS
__UNIX__ any Unix __UNIX__ any Unix
__WIN95__ GUI for Windows 95 and above; NT 4.0 and above. __WIN95__ GUI for Windows 95 and above; NT 4.0 and above.
@@ -16,6 +16,10 @@ __WIN32__ WIN32 API
__NT__ Windows NT __NT__ Windows NT
__CURSES__ CURSES __CURSES__ CURSES
In fact, they should better all start with __WX instead of __ only.
The only GUIs implemented for 2.0 are __WXGTK__, __WXMSW__ and __WXMOTIF__
yet. Any new ones, please start the define with __WX.
OSes/machines: OSes/machines:
__HPUX__ __HPUX__

10
include/wx/app.h
View File

@@ -12,22 +12,22 @@
#ifndef __APPH_BASE__ #ifndef __APPH_BASE__
#define __APPH_BASE__ #define __APPH_BASE__
#ifndef __GTK__ #ifndef __WXGTK__
class WXDLLEXPORT wxApp; class WXDLLEXPORT wxApp;
typedef wxApp* (*wxAppInitializerFunction) (void); typedef wxApp* (*wxAppInitializerFunction) (void);
#endif #endif
#include "wx/object.h" #include "wx/object.h"
#ifdef __GTK__ #ifdef __WXGTK__
typedef wxObject* (*wxAppInitializerFunction) (void); // returning wxApp* won't work with gcc typedef wxObject* (*wxAppInitializerFunction) (void); // returning wxApp* won't work with gcc
#endif #endif
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/app.h" #include "wx/msw/app.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/app.h" #include "wx/xt/app.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/app.h" #include "wx/gtk/app.h"
#endif #endif

6
include/wx/bitmap.h
View File

@@ -1,11 +1,11 @@
#ifndef __BITMAPH_BASE__ #ifndef __BITMAPH_BASE__
#define __BITMAPH_BASE__ #define __BITMAPH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/bitmap.h" #include "wx/msw/bitmap.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/bitmap.h" #include "wx/xt/bitmap.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/bitmap.h" #include "wx/gtk/bitmap.h"
#endif #endif

6
include/wx/bmpbuttn.h
View File

@@ -1,11 +1,11 @@
#ifndef __BMPBUTTONH_BASE__ #ifndef __BMPBUTTONH_BASE__
#define __BMPBUTTONH_BASE__ #define __BMPBUTTONH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/bmpbuttn.h" #include "wx/msw/bmpbuttn.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/bmpbuttn.h" #include "wx/xt/bmpbuttn.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/bmpbuttn.h" #include "wx/gtk/bmpbuttn.h"
#endif #endif

6
include/wx/brush.h
View File

@@ -1,11 +1,11 @@
#ifndef __BRUSHH_BASE__ #ifndef __BRUSHH_BASE__
#define __BRUSHH_BASE__ #define __BRUSHH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/brush.h" #include "wx/msw/brush.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/brush.h" #include "wx/xt/brush.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/brush.h" #include "wx/gtk/brush.h"
#endif #endif

6
include/wx/button.h
View File

@@ -1,11 +1,11 @@
#ifndef __BUTTONH_BASE__ #ifndef __BUTTONH_BASE__
#define __BUTTONH_BASE__ #define __BUTTONH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/button.h" #include "wx/msw/button.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/button.h" #include "wx/xt/button.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/button.h" #include "wx/gtk/button.h"
#endif #endif

6
include/wx/checkbox.h
View File

@@ -1,11 +1,11 @@
#ifndef __CHECKBOXH_BASE__ #ifndef __CHECKBOXH_BASE__
#define __CHECKBOXH_BASE__ #define __CHECKBOXH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/checkbox.h" #include "wx/msw/checkbox.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/checkbox.h" #include "wx/xt/checkbox.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/checkbox.h" #include "wx/gtk/checkbox.h"
#endif #endif

6
include/wx/choice.h
View File

@@ -1,11 +1,11 @@
#ifndef __CHOICEH_BASE__ #ifndef __CHOICEH_BASE__
#define __CHOICEH_BASE__ #define __CHOICEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/choice.h" #include "wx/msw/choice.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/choice.h" #include "wx/xt/choice.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/choice.h" #include "wx/gtk/choice.h"
#endif #endif

6
include/wx/clipbrd.h
View File

@@ -1,11 +1,11 @@
#ifndef __CLIPBRDH_BASE__ #ifndef __CLIPBRDH_BASE__
#define __CLIPBRDH_BASE__ #define __CLIPBRDH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/clipbrd.h" #include "wx/msw/clipbrd.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/clipbrd.h" #include "wx/xt/clipbrd.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/clipbrd.h" #include "wx/gtk/clipbrd.h"
#endif #endif

4
include/wx/cmndata.h
View File

@@ -82,7 +82,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
DECLARE_DYNAMIC_CLASS(wxPrintData) DECLARE_DYNAMIC_CLASS(wxPrintData)
public: public:
#ifdef __WINDOWS__ #ifdef __WXMSW__
void *printData; void *printData;
#endif #endif
int printFromPage; int printFromPage;
@@ -137,7 +137,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
void operator=(const wxPrintData& data); void operator=(const wxPrintData& data);
#ifdef __WINDOWS__ #ifdef __WXMSW__
// Convert to/from the PRINTDLG structure // Convert to/from the PRINTDLG structure
void ConvertToNative(void); void ConvertToNative(void);
void ConvertFromNative(void); void ConvertFromNative(void);

6
include/wx/colordlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __COLORDLGH_BASE__ #ifndef __COLORDLGH_BASE__
#define __COLORDLGH_BASE__ #define __COLORDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/colordlg.h" #include "wx/msw/colordlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#endif #endif

6
include/wx/combobox.h
View File

@@ -1,11 +1,11 @@
#ifndef __COMBOBOXH_BASE__ #ifndef __COMBOBOXH_BASE__
#define __COMBOBOXH_BASE__ #define __COMBOBOXH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/combobox.h" #include "wx/msw/combobox.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/combobox.h" #include "wx/xt/combobox.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/combobox.h" #include "wx/gtk/combobox.h"
#endif #endif

6
include/wx/control.h
View File

@@ -1,11 +1,11 @@
#ifndef __CONTROLH_BASE__ #ifndef __CONTROLH_BASE__
#define __CONTROLH_BASE__ #define __CONTROLH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/control.h" #include "wx/msw/control.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/control.h" #include "wx/xt/control.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/control.h" #include "wx/gtk/control.h"
#endif #endif

6
include/wx/cursor.h
View File

@@ -1,11 +1,11 @@
#ifndef __CURSORH_BASE__ #ifndef __CURSORH_BASE__
#define __CURSORH_BASE__ #define __CURSORH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/cursor.h" #include "wx/msw/cursor.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/cursor.h" #include "wx/xt/cursor.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/cursor.h" #include "wx/gtk/cursor.h"
#endif #endif

6
include/wx/dc.h
View File

@@ -1,11 +1,11 @@
#ifndef __DCH_BASE__ #ifndef __DCH_BASE__
#define __DCH_BASE__ #define __DCH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dc.h" #include "wx/msw/dc.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dc.h" #include "wx/xt/dc.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dc.h" #include "wx/gtk/dc.h"
#endif #endif

6
include/wx/dcclient.h
View File

@@ -1,11 +1,11 @@
#ifndef __DCCLIENTH_BASE__ #ifndef __DCCLIENTH_BASE__
#define __DCCLIENTH_BASE__ #define __DCCLIENTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dcclient.h" #include "wx/msw/dcclient.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dcclient.h" #include "wx/xt/dcclient.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dcclient.h" #include "wx/gtk/dcclient.h"
#endif #endif

6
include/wx/dcmemory.h
View File

@@ -1,11 +1,11 @@
#ifndef __DCMEMORYH_BASE__ #ifndef __DCMEMORYH_BASE__
#define __DCMEMORYH_BASE__ #define __DCMEMORYH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dcmemory.h" #include "wx/msw/dcmemory.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dcmemory.h" #include "wx/xt/dcmemory.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dcmemory.h" #include "wx/gtk/dcmemory.h"
#endif #endif

2
include/wx/dcprint.h
View File

@@ -1,7 +1,7 @@
#ifndef __DCPRINTH_BASE__ #ifndef __DCPRINTH_BASE__
#define __DCPRINTH_BASE__ #define __DCPRINTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dcprint.h" #include "wx/msw/dcprint.h"
#endif #endif

6
include/wx/dcscreen.h
View File

@@ -1,11 +1,11 @@
#ifndef __DCSCREENH_BASE__ #ifndef __DCSCREENH_BASE__
#define __DCSCREENH_BASE__ #define __DCSCREENH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dcscreen.h" #include "wx/msw/dcscreen.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dcscreen.h" #include "wx/xt/dcscreen.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dcscreen.h" #include "wx/gtk/dcscreen.h"
#endif #endif

6
include/wx/dde.h
View File

@@ -1,11 +1,11 @@
#ifndef __DDEH_BASE__ #ifndef __DDEH_BASE__
#define __DDEH_BASE__ #define __DDEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dde.h" #include "wx/msw/dde.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dde.h" #include "wx/xt/dde.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dde.h" #include "wx/gtk/dde.h"
#endif #endif

34
include/wx/defs.h
View File

@@ -16,7 +16,7 @@
#pragma interface "defs.h" #pragma interface "defs.h"
#endif #endif
#ifdef __GTK__ #ifdef __WXGTK__
#include "glib.h" #include "glib.h"
#include "gdk/gdk.h" #include "gdk/gdk.h"
@@ -43,14 +43,14 @@
////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////
// Currently Only MS-Windows/NT, XView and Motif are supported // Currently Only MS-Windows/NT, XView and Motif are supported
// //
#if defined(__HPUX__) && !defined(__MOTIF__) #if defined(__HPUX__) && !defined(__WXMOTIF__)
# define __MOTIF__ # define __WXMOTIF__
#endif #endif
#if defined(__MOTIF__) #if defined(__WXMOTIF__)
# define __X__ # define __X__
#elif defined(__WINDOWS__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__) #elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__)
# ifndef __WINDOWS__ # ifndef __WXMSW__
# define __WINDOWS__ # define __WXMSW__
# endif # endif
#endif #endif
@@ -68,13 +68,13 @@
#endif #endif
// Make sure the environment is set correctly // Make sure the environment is set correctly
#if defined(__WINDOWS__) && defined(__X__) #if defined(__WXMSW__) && defined(__X__)
# error "Target can't be both X and Windows" # error "Target can't be both X and Windows"
#elif !defined(__MOTIF__) && !defined(__WINDOWS__) && !defined(__GTK__) && !defined(__MAC__) && !defined(__X__) #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__MAC__) && !defined(__X__)
#error "No Target! Use -D[__MOTIF__|__GTK__|__WINDOWS__|__MAC__]" #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
#endif #endif
#if defined(__MOTIF__) || defined(__GTK__) #if defined(__WXMOTIF__) || defined(__WXGTK__)
// Bool is now obsolete, use bool instead // Bool is now obsolete, use bool instead
// typedef int Bool; // typedef int Bool;
@@ -85,7 +85,7 @@
# define Bool_DEFINED # define Bool_DEFINED
#endif #endif
#elif defined(__WINDOWS__) #elif defined(__WXMSW__)
#ifndef TRUE #ifndef TRUE
# define TRUE 1 # define TRUE 1
@@ -119,7 +119,7 @@ typedef int wxWindowID;
* Making or using wxWindows as a Windows DLL * Making or using wxWindows as a Windows DLL
*/ */
#ifdef __WINDOWS__ #ifdef __WXMSW__
#ifdef __BORLANDC__ #ifdef __BORLANDC__
@@ -230,8 +230,8 @@ enum ErrCode
#endif #endif
#ifndef __UNIX__ // Windows #ifndef __UNIX__ // Windows
#ifndef __WINDOWS__ #ifndef __WXMSW__
#define __WINDOWS__ #define __WXMSW__
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
@@ -248,7 +248,7 @@ enum ErrCode
#if defined(__UNIX__) #if defined(__UNIX__)
#define FILE_PATH_SEPARATOR ('/') #define FILE_PATH_SEPARATOR ('/')
#elif defined(__WINDOWS__) #elif defined(__WXMSW__)
#define FILE_PATH_SEPARATOR ('\\') #define FILE_PATH_SEPARATOR ('\\')
#else #else
#error "don't know path separator for this platform" #error "don't know path separator for this platform"
@@ -833,7 +833,7 @@ enum {
#define wxID_YES 5103 #define wxID_YES 5103
#define wxID_NO 5104 #define wxID_NO 5104
#ifdef __WINDOWS__ #ifdef __WXMSW__
// Stand-ins for Windows types, to avoid // Stand-ins for Windows types, to avoid
// #including all of windows.h // #including all of windows.h

6
include/wx/dialog.h
View File

@@ -1,11 +1,11 @@
#ifndef __DIALOGH_BASE__ #ifndef __DIALOGH_BASE__
#define __DIALOGH_BASE__ #define __DIALOGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dialog.h" #include "wx/msw/dialog.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dialog.h" #include "wx/xt/dialog.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dialog.h" #include "wx/gtk/dialog.h"
#endif #endif

6
include/wx/dirdlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __DIRDLGH_BASE__ #ifndef __DIRDLGH_BASE__
#define __DIRDLGH_BASE__ #define __DIRDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/dirdlg.h" #include "wx/msw/dirdlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/dirdlg.h" #include "wx/xt/dirdlg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dirdlg.h" #include "wx/gtk/dirdlg.h"
#endif #endif

6
include/wx/dnd.h
View File

@@ -1,12 +1,12 @@
#ifndef __DNDH_BASE__ #ifndef __DNDH_BASE__
#define __DNDH_BASE__ #define __DNDH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/ole/dropsrc.h" #include "wx/msw/ole/dropsrc.h"
#include "wx/msw/ole/droptgt.h" #include "wx/msw/ole/droptgt.h"
#include "wx/msw/ole/dataobj.h" #include "wx/msw/ole/dataobj.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/dnd.h" #include "wx/gtk/dnd.h"
#endif #endif

6
include/wx/filedlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __FILEDLGH_BASE__ #ifndef __FILEDLGH_BASE__
#define __FILEDLGH_BASE__ #define __FILEDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/filedlg.h" #include "wx/msw/filedlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/filedlg.h" #include "wx/xt/filedlg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/filedlg.h" #include "wx/gtk/filedlg.h"
#endif #endif

6
include/wx/font.h
View File

@@ -1,11 +1,11 @@
#ifndef __FONTH_BASE__ #ifndef __FONTH_BASE__
#define __FONTH_BASE__ #define __FONTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/font.h" #include "wx/msw/font.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/font.h" #include "wx/xt/font.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/font.h" #include "wx/gtk/font.h"
#endif #endif

6
include/wx/fontdlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __FONTDLGH_BASE__ #ifndef __FONTDLGH_BASE__
#define __FONTDLGH_BASE__ #define __FONTDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/fontdlg.h" #include "wx/msw/fontdlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
#endif #endif

6
include/wx/frame.h
View File

@@ -1,11 +1,11 @@
#ifndef __FRAMEH_BASE__ #ifndef __FRAMEH_BASE__
#define __FRAMEH_BASE__ #define __FRAMEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/frame.h" #include "wx/msw/frame.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/frame.h" #include "wx/xt/frame.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/frame.h" #include "wx/gtk/frame.h"
#endif #endif

6
include/wx/gauge.h
View File

@@ -1,11 +1,11 @@
#ifndef __GAUGEH_BASE__ #ifndef __GAUGEH_BASE__
#define __GAUGEH_BASE__ #define __GAUGEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/gauge.h" #include "wx/msw/gauge.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/gauge.h" #include "wx/xt/gauge.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/gauge.h" #include "wx/gtk/gauge.h"
#endif #endif

10
include/wx/gdicmn.h
View File

@@ -21,11 +21,11 @@
#include "wx/hash.h" #include "wx/hash.h"
#include "wx/setup.h" #include "wx/setup.h"
#ifdef __WINDOWS__ #ifdef __WXMSW__
#include "wx/msw/colour.h" #include "wx/msw/colour.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/colour.h" #include "wx/xt/colour.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/colour.h" #include "wx/gtk/colour.h"
#endif #endif
@@ -98,7 +98,7 @@ class WXDLLEXPORT wxRealPoint
class WXDLLEXPORT wxPoint class WXDLLEXPORT wxPoint
{ {
public: public:
#if defined(__WINDOWS__) && !defined(__WIN32__) #if defined(__WXMSW__) && !defined(__WIN32__)
int x; int x;
int y; int y;
#else #else
@@ -330,7 +330,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
// Useful macro for create icons portably // Useful macro for create icons portably
#ifdef __WINDOWS__ #ifdef __WXMSW__
# define wxICON(X) wxIcon(X##_icon); # define wxICON(X) wxIcon(X##_icon);
#elif defined(__X__) #elif defined(__X__)
# define wxICON(X) wxIcon(X##_bits, X##_width, X##_height); # define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);

6
include/wx/gdiobj.h
View File

@@ -1,11 +1,11 @@
#ifndef __GDIOBJH_BASE__ #ifndef __GDIOBJH_BASE__
#define __GDIOBJH_BASE__ #define __GDIOBJH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/gdiobj.h" #include "wx/msw/gdiobj.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/gdiobj.h" #include "wx/xt/gdiobj.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/gdiobj.h" #include "wx/gtk/gdiobj.h"
#endif #endif

2
include/wx/generic/colrdlgg.h
View File

@@ -116,7 +116,7 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#ifdef __GTK__ #ifdef __WXGTK__
typedef wxGenericColourDialog wxColourDialog; typedef wxGenericColourDialog wxColourDialog;
#endif #endif

6
include/wx/generic/helpxlp.h
View File

@@ -25,7 +25,7 @@
#include "wx/helpbase.h" #include "wx/helpbase.h"
#ifdef __WINDOWS__ #ifdef __WXMSW__
#include "wx/dde.h" #include "wx/dde.h"
#else #else
// Or whatever it'll be called // Or whatever it'll be called
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxXLPHelpController;
// wxHelp process and the application // wxHelp process and the application
class WXDLLEXPORT wxXLPHelpConnection: public class WXDLLEXPORT wxXLPHelpConnection: public
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxDDEConnection wxDDEConnection
#else #else
wxTCPConnection wxTCPConnection
@@ -62,7 +62,7 @@ class WXDLLEXPORT wxXLPHelpConnection: public
// controlling the wxHelp process // controlling the wxHelp process
class WXDLLEXPORT wxXLPHelpClient: public class WXDLLEXPORT wxXLPHelpClient: public
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxDDEClient wxDDEClient
#else #else
wxTCPClient wxTCPClient

2
include/wx/generic/msgdlgg.h
View File

@@ -40,7 +40,7 @@ public:
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#ifndef __WINDOWS__ #ifndef __WXMSW__
#define wxMessageDialog wxGenericMessageDialog #define wxMessageDialog wxGenericMessageDialog
int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr, int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,

8
include/wx/help.h
View File

@@ -1,18 +1,18 @@
#ifndef __HELPH_BASE__ #ifndef __HELPH_BASE__
#define __HELPH_BASE__ #define __HELPH_BASE__
#ifdef __WINDOWS__ #ifdef __WXMSW__
#include "wx/msw/helpwin.h" #include "wx/msw/helpwin.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/helphtml.h" #include "wx/generic/helphtml.h"
#else #else
#include "wx/generic/helpxlp.h" #include "wx/generic/helpxlp.h"
#endif #endif
#ifdef __WINDOWS__ #ifdef __WXMSW__
#define wxHelpController wxWinHelpController #define wxHelpController wxWinHelpController
#define classwxHelpController classwxWinHelpController #define classwxHelpController classwxWinHelpController
#elif defined(__GTK__) #elif defined(__WXGTK__)
#define wxHelpController wxHTMLHelpController #define wxHelpController wxHTMLHelpController
#define classwxHelpController classwxHTMLHelpController #define classwxHelpController classwxHTMLHelpController
#else #else

6
include/wx/icon.h
View File

@@ -1,11 +1,11 @@
#ifndef __ICONH_BASE__ #ifndef __ICONH_BASE__
#define __ICONH_BASE__ #define __ICONH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/icon.h" #include "wx/msw/icon.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/icon.h" #include "wx/xt/icon.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/icon.h" #include "wx/gtk/icon.h"
#endif #endif

6
include/wx/imaglist.h
View File

@@ -1,11 +1,11 @@
#ifndef __IMAGLISTH_BASE__ #ifndef __IMAGLISTH_BASE__
#define __IMAGLISTH_BASE__ #define __IMAGLISTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/imaglist.h" #include "wx/msw/imaglist.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#endif #endif

6
include/wx/joystick.h
View File

@@ -1,10 +1,10 @@
#ifndef __JOYSTICKH_BASE__ #ifndef __JOYSTICKH_BASE__
#define __JOYSTICKH_BASE__ #define __JOYSTICKH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/joystick.h" #include "wx/msw/joystick.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/joystick.h" #include "wx/gtk/joystick.h"
#endif #endif

6
include/wx/listbox.h
View File

@@ -1,11 +1,11 @@
#ifndef __LISTBOXH_BASE__ #ifndef __LISTBOXH_BASE__
#define __LISTBOXH_BASE__ #define __LISTBOXH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/listbox.h" #include "wx/msw/listbox.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/listbox.h" #include "wx/xt/listbox.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/listbox.h" #include "wx/gtk/listbox.h"
#endif #endif

6
include/wx/listctrl.h
View File

@@ -1,11 +1,11 @@
#ifndef __LISTCTRLH_BASE__ #ifndef __LISTCTRLH_BASE__
#define __LISTCTRLH_BASE__ #define __LISTCTRLH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/listctrl.h" #include "wx/msw/listctrl.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#endif #endif

2
include/wx/log.h
View File

@@ -42,7 +42,7 @@ enum
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation #define wxTraceResAlloc 0x0004 // trace GDI resource allocation
#define wxTraceRefCount 0x0008 // trace various ref counting operations #define wxTraceRefCount 0x0008 // trace various ref counting operations
#ifdef __WINDOWS__ #ifdef __WXMSW__
#define wxTraceOleCalls 0x0100 // OLE interface calls #define wxTraceOleCalls 0x0100 // OLE interface calls
#endif #endif

6
include/wx/mdi.h
View File

@@ -1,11 +1,11 @@
#ifndef __MDIH_BASE__ #ifndef __MDIH_BASE__
#define __MDIH_BASE__ #define __MDIH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/mdi.h" #include "wx/msw/mdi.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/mdi.h" #include "wx/xt/mdi.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/mdi.h" #include "wx/gtk/mdi.h"
#endif #endif

6
include/wx/menu.h
View File

@@ -1,11 +1,11 @@
#ifndef __MENUH_BASE__ #ifndef __MENUH_BASE__
#define __MENUH_BASE__ #define __MENUH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/menu.h" #include "wx/msw/menu.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/menu.h" #include "wx/xt/menu.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/menu.h" #include "wx/gtk/menu.h"
#endif #endif

2
include/wx/metafile.h
View File

@@ -1,7 +1,7 @@
#ifndef __METAFILEH_BASE__ #ifndef __METAFILEH_BASE__
#define __METAFILEH_BASE__ #define __METAFILEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/metafile.h" #include "wx/msw/metafile.h"
#endif #endif

6
include/wx/minifram.h
View File

@@ -1,11 +1,11 @@
#ifndef __MINIFRAMH_BASE__ #ifndef __MINIFRAMH_BASE__
#define __MINIFRAMH_BASE_ #define __MINIFRAMH_BASE_
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/minifram.h" #include "wx/msw/minifram.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/minifram.h" #include "wx/xt/minifram.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/minifram.h" #include "wx/gtk/minifram.h"
#endif #endif

6
include/wx/msgdlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __MSGDLGH_BASE__ #ifndef __MSGDLGH_BASE__
#define __MSGDLGH_BASE__ #define __MSGDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/msgdlg.h" #include "wx/msw/msgdlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/msgdlgg.h" #include "wx/generic/msgdlgg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/msgdlgg.h" #include "wx/generic/msgdlgg.h"
#endif #endif

2
include/wx/msw/bitmap.h
View File

@@ -79,7 +79,7 @@ public:
wxPalette m_bitmapPalette; wxPalette m_bitmapPalette;
int m_quality; int m_quality;
#ifdef __WINDOWS__ #ifdef __WXMSW__
WXHBITMAP m_hBitmap; WXHBITMAP m_hBitmap;
wxDC * m_selectedInto; // So bitmap knows whether it's been selected into wxDC * m_selectedInto; // So bitmap knows whether it's been selected into
// a device context (for error checking) // a device context (for error checking)

6
include/wx/notebook.h
View File

@@ -1,11 +1,11 @@
#ifndef __NOTEBOOKH_BASE__ #ifndef __NOTEBOOKH_BASE__
#define __NOTEBOOKH_BASE__ #define __NOTEBOOKH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/notebook.h" #include "wx/msw/notebook.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#error "wxNotebook not implemented under Motif" #error "wxNotebook not implemented under Motif"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/notebook.h" #include "wx/gtk/notebook.h"
#endif #endif

2
include/wx/odbc.h
View File

@@ -20,7 +20,7 @@
#ifndef __ODBCH__ #ifndef __ODBCH__
#define __ODBCH__ #define __ODBCH__
#ifdef __WINDOWS__ #ifdef __WXMSW__
#include <windows.h> #include <windows.h>
#endif #endif

6
include/wx/palette.h
View File

@@ -1,11 +1,11 @@
#ifndef __PALETTEH_BASE__ #ifndef __PALETTEH_BASE__
#define __PALETTEH_BASE__ #define __PALETTEH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/palette.h" #include "wx/msw/palette.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/palette.h" #include "wx/xt/palette.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/palette.h" #include "wx/gtk/palette.h"
#endif #endif

6
include/wx/pen.h
View File

@@ -1,11 +1,11 @@
#ifndef __PENH_BASE__ #ifndef __PENH_BASE__
#define __PENH_BASE__ #define __PENH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/pen.h" #include "wx/msw/pen.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/pen.h" #include "wx/xt/pen.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/pen.h" #include "wx/gtk/pen.h"
#endif #endif

6
include/wx/pnghand.h
View File

@@ -1,11 +1,11 @@
#ifndef __PNGHANDH_BASE__ #ifndef __PNGHANDH_BASE__
#define __PNGHANDH_BASE__ #define __PNGHANDH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/pnghand.h" #include "wx/msw/pnghand.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/pnghand.h" #include "wx/xt/pnghand.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/pnghand.h" #include "wx/gtk/pnghand.h"
#endif #endif

2
include/wx/postscrp.h
View File

@@ -64,7 +64,7 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
// RR: I define these in wxDC, after all they all do the same everywhere // RR: I define these in wxDC, after all they all do the same everywhere
#ifdef __WINDOWS__ #ifdef __WXMSW__
// Splines // Splines
// 3-point spline // 3-point spline
void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3); void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);

2
include/wx/print.h
View File

@@ -1,7 +1,7 @@
#ifndef __PRINTH_BASE__ #ifndef __PRINTH_BASE__
#define __PRINTH_BASE__ #define __PRINTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/printwin.h" #include "wx/msw/printwin.h"
#ifndef wxPrinter #ifndef wxPrinter

6
include/wx/printdlg.h
View File

@@ -1,11 +1,11 @@
#ifndef __PRINTDLGH_BASE__ #ifndef __PRINTDLGH_BASE__
#define __PRINTDLGH_BASE__ #define __PRINTDLGH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/printdlg.h" #include "wx/msw/printdlg.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/prntdlgg.h" #include "wx/generic/prntdlgg.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/prntdlgg.h" #include "wx/generic/prntdlgg.h"
#endif #endif

6
include/wx/radiobox.h
View File

@@ -1,11 +1,11 @@
#ifndef __RADIOBOXH_BASE__ #ifndef __RADIOBOXH_BASE__
#define __RADIOBOXH_BASE__ #define __RADIOBOXH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/radiobox.h" #include "wx/msw/radiobox.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/radiobox.h" #include "wx/xt/radiobox.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/radiobox.h" #include "wx/gtk/radiobox.h"
#endif #endif

6
include/wx/radiobut.h
View File

@@ -1,11 +1,11 @@
#ifndef __RADIOBUTH_BASE__ #ifndef __RADIOBUTH_BASE__
#define __RADIOBUTH_BASE__ #define __RADIOBUTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/radiobut.h" #include "wx/msw/radiobut.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/radiobut.h" #include "wx/xt/radiobut.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/radiobut.h" #include "wx/gtk/radiobut.h"
#endif #endif

6
include/wx/region.h
View File

@@ -1,11 +1,11 @@
#ifndef __REGIONH_BASE__ #ifndef __REGIONH_BASE__
#define __REGIONH_BASE__ #define __REGIONH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/region.h" #include "wx/msw/region.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/region.h" #include "wx/xt/region.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/region.h" #include "wx/gtk/region.h"
#endif #endif

6
include/wx/scrolbar.h
View File

@@ -1,11 +1,11 @@
#ifndef __SCROLBARH_BASE__ #ifndef __SCROLBARH_BASE__
#define __SCROLBARH_BASE__ #define __SCROLBARH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/scrolbar.h" #include "wx/msw/scrolbar.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/scrolbar.h" #include "wx/xt/scrolbar.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/scrolbar.h" #include "wx/gtk/scrolbar.h"
#endif #endif

6
include/wx/settings.h
View File

@@ -104,11 +104,11 @@
#define wxSYS_SHOW_SOUNDS 36 #define wxSYS_SHOW_SOUNDS 36
#define wxSYS_SWAP_BUTTONS 37 #define wxSYS_SWAP_BUTTONS 37
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/settings.h" #include "wx/msw/settings.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/settings.h" #include "wx/xt/settings.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/settings.h" #include "wx/gtk/settings.h"
#endif #endif

20
include/wx/setup.h
View File

@@ -2,11 +2,25 @@
#ifndef __SETUPH_BASE__ #ifndef __SETUPH_BASE__
#define __SETUPH_BASE__ #define __SETUPH_BASE__
// compatibility code, to be removed asap:
#if ! defined(__WXMSW__) && ! defined(__WXGTK__) && ! defined(__WXMOTIF__)
# if defined(__WINDOWS__) # if defined(__WINDOWS__)
#include "wx/msw/setup.h" # define __WXMSW__
#elif defined(__MOTIF__)
#include "wx/xt/setup.h"
# elif defined(__GTK__) # elif defined(__GTK__)
# define __WXGTK__
# elif defined(__MOTIF__)
# define __WXMOTIF__
# else
# error No __WXxxx__ define set! Please define __WXGTK__,__WXMSW__ or __WXMOTIF__.
# endif
#endif
#if defined(__WXMSW__)
#include "wx/msw/setup.h"
#elif defined(__WXMOTIF__)
#include "wx/xt/setup.h"
#elif defined(__WXGTK__)
#include "wx/gtk/setup.h" #include "wx/gtk/setup.h"
#endif #endif

6
include/wx/slider.h
View File

@@ -1,11 +1,11 @@
#ifndef __SLIDERH_BASE__ #ifndef __SLIDERH_BASE__
#define __SLIDERH_BASE__ #define __SLIDERH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/slider.h" #include "wx/msw/slider.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/slider.h" #include "wx/xt/slider.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/slider.h" #include "wx/gtk/slider.h"
#endif #endif

6
include/wx/spinbutt.h
View File

@@ -1,11 +1,11 @@
#ifndef __SPINBUTTH_BASE__ #ifndef __SPINBUTTH_BASE__
#define __SPINBUTTH_BASE__ #define __SPINBUTTH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/spinbutt.h" #include "wx/msw/spinbutt.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/spinbutt.h" #include "wx/xt/spinbutt.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/spinbutt.h" #include "wx/gtk/spinbutt.h"
#endif #endif

6
include/wx/statbmp.h
View File

@@ -1,11 +1,11 @@
#ifndef __STATBMPH_BASE__ #ifndef __STATBMPH_BASE__
#define __STATBMPH_BASE__ #define __STATBMPH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/statbmp.h" #include "wx/msw/statbmp.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/statbmp.h" #include "wx/xt/statbmp.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/statbmp.h" #include "wx/gtk/statbmp.h"
#endif #endif

6
include/wx/statbox.h
View File

@@ -1,11 +1,11 @@
#ifndef __STATBOXH_BASE__ #ifndef __STATBOXH_BASE__
#define __STATBOXH_BASE__ #define __STATBOXH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/statbox.h" #include "wx/msw/statbox.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/statbox.h" #include "wx/xt/statbox.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/statbox.h" #include "wx/gtk/statbox.h"
#endif #endif

6
include/wx/stattext.h
View File

@@ -1,11 +1,11 @@
#ifndef __STATTEXTH_BASE__ #ifndef __STATTEXTH_BASE__
#define __STATTEXTH_BASE_ #define __STATTEXTH_BASE_
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/stattext.h" #include "wx/msw/stattext.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/stattext.h" #include "wx/xt/stattext.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/stattext.h" #include "wx/gtk/stattext.h"
#endif #endif

6
include/wx/tabctrl.h
View File

@@ -1,11 +1,11 @@
#ifndef __TABCTRLH_BASE__ #ifndef __TABCTRLH_BASE__
#define __TABCTRLH_BASE__ #define __TABCTRLH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/tabctrl.h" #include "wx/msw/tabctrl.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/tabctrl.h" #include "wx/xt/tabctrl.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#endif #endif
#endif #endif

6
include/wx/tbar95.h
View File

@@ -1,11 +1,11 @@
#ifndef __TBAR95H_BASE__ #ifndef __TBAR95H_BASE__
#define __TBAR95H_BASE__ #define __TBAR95H_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/tbar95.h" #include "wx/msw/tbar95.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/tbar95.h" #include "wx/xt/tbar95.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/tbar95.h" #include "wx/gtk/tbar95.h"
#endif #endif

2
include/wx/tbarbase.h
View File

@@ -188,7 +188,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
void OnIdle(wxIdleEvent& event); void OnIdle(wxIdleEvent& event);
// Required to force normal cursor-setting behaviour in Windows // Required to force normal cursor-setting behaviour in Windows
#ifdef __WINDOWS__ #ifdef __WXMSW__
virtual void MSWOnMouseMove(int x, int y, const WXUINT flags); virtual void MSWOnMouseMove(int x, int y, const WXUINT flags);
#endif #endif

6
include/wx/tbarmsw.h
View File

@@ -1,11 +1,11 @@
#ifndef __TBARMSWH_BASE__ #ifndef __TBARMSWH_BASE__
#define __TBARMSWH_BASE__ #define __TBARMSWH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/tbarmsw.h" #include "wx/msw/tbarmsw.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/tbarmsw.h" #include "wx/xt/tbarmsw.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/tbarmsw.h" #include "wx/gtk/tbarmsw.h"
#endif #endif

6
include/wx/textctrl.h
View File

@@ -1,11 +1,11 @@
#ifndef __TEXTCTRLH_BASE__ #ifndef __TEXTCTRLH_BASE__
#define __TEXTCTRLH_BASE__ #define __TEXTCTRLH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/textctrl.h" #include "wx/msw/textctrl.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/textctrl.h" #include "wx/xt/textctrl.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/textctrl.h" #include "wx/gtk/textctrl.h"
#endif #endif

6
include/wx/timer.h
View File

@@ -1,11 +1,11 @@
#ifndef __TIMERH_BASE__ #ifndef __TIMERH_BASE__
#define __TIMERH_BASE__ #define __TIMERH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/timer.h" #include "wx/msw/timer.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/timer.h" #include "wx/xt/timer.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/timer.h" #include "wx/gtk/timer.h"
#endif #endif

6
include/wx/toolbar.h
View File

@@ -1,15 +1,15 @@
#ifndef _TOOLBAR_H_BASE_ #ifndef _TOOLBAR_H_BASE_
#define _TOOLBAR_H_BASE_ #define _TOOLBAR_H_BASE_
#if defined(__WINDOWS__) && defined(__WIN95__) #if defined(__WXMSW__) && defined(__WIN95__)
# include "wx/tbar95.h" # include "wx/tbar95.h"
# define wxToolBar wxToolBar95 # define wxToolBar wxToolBar95
# define classwxToolBar classwxToolBar95 # define classwxToolBar classwxToolBar95
#elif defined(__WINDOWS__) #elif defined(__WXMSW__)
# include "wx/tbarmsw.h" # include "wx/tbarmsw.h"
# define wxToolBar wxToolBarMSW # define wxToolBar wxToolBarMSW
# define classwxToolBar classwxToolBarMSW # define classwxToolBar classwxToolBarMSW
#elif defined(__GTK__) #elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h" # include "wx/gtk/tbargtk.h"
# define classwxToolBar wxToolBarGTK # define classwxToolBar wxToolBarGTK
#endif #endif

6
include/wx/treectrl.h
View File

@@ -1,11 +1,11 @@
#ifndef __TREECTRLH_BASE__ #ifndef __TREECTRLH_BASE__
#define __TREECTRLH_BASE__ #define __TREECTRLH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/treectrl.h" #include "wx/msw/treectrl.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/generic/treectrl.h" #include "wx/generic/treectrl.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/generic/treectrl.h" #include "wx/generic/treectrl.h"
#endif #endif

2
include/wx/utils.h
View File

@@ -266,7 +266,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
// MSW only: get user-defined resource from the .res file. // MSW only: get user-defined resource from the .res file.
// Returns NULL or newly-allocated memory, so use delete[] to clean up. // Returns NULL or newly-allocated memory, so use delete[] to clean up.
#ifdef __WINDOWS__ #ifdef __WXMSW__
extern const char* WXDLLEXPORT wxUserResourceStr; extern const char* WXDLLEXPORT wxUserResourceStr;
char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr); char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
#endif #endif

6
include/wx/window.h
View File

@@ -1,11 +1,11 @@
#ifndef __WINDOWH_BASE__ #ifndef __WINDOWH_BASE__
#define __WINDOWH_BASE__ #define __WINDOWH_BASE__
#if defined(__WINDOWS__) #if defined(__WXMSW__)
#include "wx/msw/window.h" #include "wx/msw/window.h"
#elif defined(__MOTIF__) #elif defined(__WXMOTIF__)
#include "wx/xt/window.h" #include "wx/xt/window.h"
#elif defined(__GTK__) #elif defined(__WXGTK__)
#include "wx/gtk/window.h" #include "wx/gtk/window.h"
#endif #endif

4
install/gtk/configure vendored
View File

@@ -4232,7 +4232,7 @@ USE_GTK=1
USE_UNIX=1 USE_UNIX=1
TOOLKIT=GTK TOOLKIT=GTK
TOOLKIT_DEF=__GTK__ TOOLKIT_DEF=__WXGTK__
USE_LINUX= USE_LINUX=
USE_SGI= USE_SGI=
@@ -6111,7 +6111,7 @@ fi
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define __GTK__ 1 #define __WXGTK__ 1
EOF EOF
fi fi

4
install/gtk/configure.in
View File

@@ -593,7 +593,7 @@ USE_GTK=1
USE_UNIX=1 USE_UNIX=1
TOOLKIT=GTK TOOLKIT=GTK
TOOLKIT_DEF=__GTK__ TOOLKIT_DEF=__WXGTK__
USE_LINUX= USE_LINUX=
USE_SGI= USE_SGI=
@@ -1180,7 +1180,7 @@ if test "$USE_GTK" = 1; then
GUI_TK_INCLUDE="$GTK_CFLAGS" GUI_TK_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS" GUI_TK_LIBRARY="$GTK_LIBS"
], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?)) ], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
AC_DEFINE(__GTK__) AC_DEFINE(__WXGTK__)
fi fi
AC_SUBST(GUI_TK_INCLUDE) AC_SUBST(GUI_TK_INCLUDE)
AC_SUBST(GUI_TK_LIBRARY) AC_SUBST(GUI_TK_LIBRARY)

2
samples/controls/controls.cpp
View File

@@ -91,7 +91,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Controls wxWindows App", 50, 50, 500, 420 ); MyFrame *frame = new MyFrame(NULL, "Controls wxWindows App", 50, 50, 500, 420 );
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

10
samples/dialogs/dialogs.cpp
View File

@@ -31,7 +31,7 @@
#include <wx/fontdlg.h> #include <wx/fontdlg.h>
#include <wx/choicdlg.h> #include <wx/choicdlg.h>
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#include <wx/generic/colrdlgg.h> #include <wx/generic/colrdlgg.h>
#include <wx/generic/fontdlgg.h> #include <wx/generic/fontdlgg.h>
#endif #endif
@@ -60,14 +60,14 @@ bool MyApp::OnInit(void)
file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour"); file_menu->Append(DIALOGS_CHOOSE_COLOUR, "&Choose colour");
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)"); file_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, "Choose colour (&generic)");
#endif #endif
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font"); file_menu->Append(DIALOGS_CHOOSE_FONT, "Choose &font");
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)"); file_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, "Choose f&ont (generic)");
#endif #endif
@@ -143,7 +143,7 @@ void MyFrame::ChooseFont(wxCommandEvent& event)
dialog->Close(); dialog->Close();
} }
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
void MyFrame::ChooseColourGeneric(wxCommandEvent& event) void MyFrame::ChooseColourGeneric(wxCommandEvent& event)
{ {
wxColourData data; wxColourData data;
@@ -286,7 +286,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen) EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave) EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave)
EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose) EVT_MENU(DIALOGS_DIR_CHOOSE, MyFrame::DirChoose)
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric) EVT_MENU(DIALOGS_CHOOSE_COLOUR_GENERIC, MyFrame::ChooseColourGeneric)
EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC, MyFrame::ChooseFontGeneric) EVT_MENU(DIALOGS_CHOOSE_FONT_GENERIC, MyFrame::ChooseFontGeneric)
#endif #endif

2
samples/dialogs/dialogs.h
View File

@@ -37,7 +37,7 @@ class MyFrame: public wxFrame
void FileSave(wxCommandEvent& event); void FileSave(wxCommandEvent& event);
void DirChoose(wxCommandEvent& event); void DirChoose(wxCommandEvent& event);
#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW #if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
void ChooseColourGeneric(wxCommandEvent& event); void ChooseColourGeneric(wxCommandEvent& event);
void ChooseFontGeneric(wxCommandEvent& event); void ChooseFontGeneric(wxCommandEvent& event);
#endif #endif

4
samples/docview/docview.cpp
View File

@@ -91,7 +91,7 @@ bool MyApp::OnInit(void)
frame = new MyFrame(m_docManager, NULL, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE); frame = new MyFrame(m_docManager, NULL, "DocView Demo", wxPoint(0, 0), wxSize(500, 400), wxDEFAULT_FRAME_STYLE);
//// Give it an icon (this is ignored in MDI mode: uses resources) //// Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("doc_icn")); frame->SetIcon(wxIcon("doc_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__
@@ -171,7 +171,7 @@ wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), "Child Frame", wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), "Child Frame",
wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE); wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
#ifdef __WINDOWS__ #ifdef __WXMSW__
subframe->SetIcon(wxString(isCanvas ? "chrt_icn" : "notepad_icn")); subframe->SetIcon(wxString(isCanvas ? "chrt_icn" : "notepad_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__

2
samples/docview/view.cpp
View File

@@ -105,7 +105,7 @@ void DrawingView::OnUpdate(wxView *sender, wxObject *hint)
canvas->Refresh(); canvas->Refresh();
/* Is the following necessary? /* Is the following necessary?
#ifdef __WINDOWS__ #ifdef __WXMSW__
if (canvas) if (canvas)
canvas->Refresh(); canvas->Refresh();
#else #else

2
samples/dynamic/minimal.cpp
View File

@@ -60,7 +60,7 @@ bool MyApp::OnInit(void)
frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout ); frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

4
samples/grid/test.cpp
View File

@@ -88,7 +88,7 @@ IMPLEMENT_APP(MyApp)
// `Main program' equivalent, creating windows and returning main app frame // `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
cellBitmap1 = new wxBitmap("bitmap1"); cellBitmap1 = new wxBitmap("bitmap1");
cellBitmap2 = new wxBitmap("bitmap2"); cellBitmap2 = new wxBitmap("bitmap2");
#endif #endif
@@ -97,7 +97,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300)); MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300));
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

2
samples/internat/internat.cpp
View File

@@ -87,7 +87,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340); MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

2
samples/joytest/joytest.cpp
View File

@@ -55,7 +55,7 @@ bool MyApp::OnInit(void)
wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL); wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources) // Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("joyicon")); frame->SetIcon(wxIcon("joyicon"));
#endif #endif
#ifdef __X__ #ifdef __X__

4
samples/layout/layout.cpp
View File

@@ -52,7 +52,7 @@ bool MyApp::OnInit(void)
frame->CreateStatusBar(2); frame->CreateStatusBar(2);
// Load icon and bitmap // Load icon and bitmap
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn")); frame->SetIcon(wxIcon("aiai_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__
@@ -186,7 +186,7 @@ void MyFrame::LoadFile(wxCommandEvent& event)
char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt"); char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
if (s) if (s)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->text_window->LoadFile(s); frame->text_window->LoadFile(s);
#endif #endif
} }

2
samples/listctrl/listtest.cpp
View File

@@ -66,7 +66,7 @@ bool MyApp::OnInit(void)
frame->SetBackgroundColour(wxColour(255, 255, 255)); frame->SetBackgroundColour(wxColour(255, 255, 255));
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

14
samples/mdi/mdi.cpp
View File

@@ -21,7 +21,7 @@
#include "wx/mdi.h" #include "wx/mdi.h"
#endif #endif
#ifdef __WINDOWS__ #ifdef __WXMSW__
#ifdef __WIN95__ #ifdef __WIN95__
#include <wx/tbar95.h> #include <wx/tbar95.h>
#else #else
@@ -51,7 +51,7 @@ bool MyApp::OnInit(void)
wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL); wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources) // Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mdi_icn")); frame->SetIcon(wxIcon("mdi_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__
@@ -100,7 +100,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
wxTE_MULTILINE|wxSUNKEN_BORDER); wxTE_MULTILINE|wxSUNKEN_BORDER);
textWindow->SetValue("A help window"); textWindow->SetValue("A help window");
#ifdef __WINDOWS__ #ifdef __WXMSW__
toolBar = new TestRibbon(this, 0, 0, 100, 30, wxNO_BORDER, wxVERTICAL, 1); toolBar = new TestRibbon(this, 0, 0, 100, 30, wxNO_BORDER, wxVERTICAL, 1);
SetToolBar(toolBar); SetToolBar(toolBar);
#endif #endif
@@ -128,7 +128,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& event)
winNumber ++; winNumber ++;
// Give it an icon (this is ignored in MDI mode: uses resources) // Give it an icon (this is ignored in MDI mode: uses resources)
#ifdef __WINDOWS__ #ifdef __WXMSW__
subframe->SetIcon(wxIcon("chrt_icn")); subframe->SetIcon(wxIcon("chrt_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__
@@ -252,7 +252,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
int tw = 0; int tw = 0;
int th = 0; int th = 0;
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxWindow* tbar = GetToolBar(); wxWindow* tbar = GetToolBar();
if (tbar) if (tbar)
{ {
@@ -302,7 +302,7 @@ bool MyChild::OnClose(void)
return TRUE; return TRUE;
} }
#ifdef __WINDOWS__ #ifdef __WXMSW__
BEGIN_EVENT_TABLE(TestRibbon, wxToolBar) BEGIN_EVENT_TABLE(TestRibbon, wxToolBar)
EVT_PAINT(TestRibbon::OnPaint) EVT_PAINT(TestRibbon::OnPaint)
@@ -323,7 +323,7 @@ TestRibbon::TestRibbon(wxFrame *frame, int x, int y, int w, int h,
bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE); bitmaps[6] = new wxBitmap("icon7", wxBITMAP_TYPE_RESOURCE);
bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE); bitmaps[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
#ifdef __WINDOWS__ #ifdef __WXMSW__
int width = 24; int width = 24;
#else #else
int width = 16; int width = 16;

6
samples/mdi/mdi.h
View File

@@ -9,7 +9,7 @@
// Licence: wxWindows license // Licence: wxWindows license
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifdef __WINDOWS__ #ifdef __WXMSW__
#ifdef __WIN95__ #ifdef __WIN95__
#define wxToolBar wxToolBar95 #define wxToolBar wxToolBar95
#else #else
@@ -34,7 +34,7 @@ class MyCanvas: public wxScrolledWindow
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
#ifdef __WINDOWS__ #ifdef __WXMSW__
class TestRibbon: public wxToolBar class TestRibbon: public wxToolBar
{ {
@@ -56,7 +56,7 @@ class MyFrame: public wxMDIParentFrame
public: public:
wxTextCtrl *textWindow; wxTextCtrl *textWindow;
#ifdef __WINDOWS__ #ifdef __WXMSW__
TestRibbon* toolBar; TestRibbon* toolBar;
#endif #endif

2
samples/minimal/minimal.cpp
View File

@@ -65,7 +65,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340); MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian")); frame->SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

4
samples/nativdlg/dialog1.rc
View File

@@ -1,8 +1,8 @@
//Microsoft Developer Studio generated resource script. //Microsoft Developer Studio generated resource script.
// //
#ifndef __WINDOWS__ #ifndef __WXMSW__
#define __WINDOWS__ #define __WXMSW__
#endif #endif
#ifndef __WIN32__ #ifndef __WIN32__

2
samples/nativdlg/makefile.b32
View File

@@ -52,7 +52,7 @@ $(TARGET).def
nativdlg.obj: nativdlg.$(SRCSUFF) nativdlg.h # dialog1.wxr nativdlg.obj: nativdlg.$(SRCSUFF) nativdlg.h # dialog1.wxr
$(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc $(TARGET).res : $(TARGET).rc $(WXDIR)\include\wx\msw\wx.rc
brc32 -r /D__WINDOWS__ /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET) brc32 -r /D__WXMSW__ /i$(BCCDIR)\include /i$(WXDIR)\include $(TARGET)
clean: clean:
-erase *.obj -erase *.obj

2
samples/nativdlg/makefile.nt
View File

@@ -50,7 +50,7 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<< <<
$(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc dialog1.rc $(PROGRAM).res : $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc dialog1.rc
$(rc) -r /i$(WXDIR)\include /D__WINDOWS__ -fo$@ $(PROGRAM).rc $(rc) -r /i$(WXDIR)\include /D__WXMSW__ -fo$@ $(PROGRAM).rc
clean: clean:

4
samples/png/pngdemo.cpp
View File

@@ -20,7 +20,7 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#ifdef __WINDOWS__ #ifdef __WXMSW__
#include <wx/pnghand.h> #include <wx/pnghand.h>
#endif #endif
@@ -37,7 +37,7 @@ MyApp::MyApp()
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxBitmap::AddHandler(new wxPNGFileHandler); wxBitmap::AddHandler(new wxPNGFileHandler);
#endif #endif

16
samples/printing/printing.cpp
View File

@@ -81,7 +81,7 @@ bool MyApp::OnInit(void)
frame->CreateStatusBar(2); frame->CreateStatusBar(2);
// Load icon and bitmap // Load icon and bitmap
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn")); frame->SetIcon(wxIcon("aiai_icn"));
#endif #endif
#ifdef __X__ #ifdef __X__
@@ -96,7 +96,7 @@ bool MyApp::OnInit(void)
file_menu->Append(WXPRINT_PAGE_SETUP, "Page Set&up...", "Page setup"); file_menu->Append(WXPRINT_PAGE_SETUP, "Page Set&up...", "Page setup");
file_menu->Append(WXPRINT_PREVIEW, "Print Pre&view", "Preview"); file_menu->Append(WXPRINT_PREVIEW, "Print Pre&view", "Preview");
#ifdef __WINDOWS__ #ifdef __WXMSW__
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(WXPRINT_PRINT_PS, "Print PostScript...", "Print (PostScript)"); file_menu->Append(WXPRINT_PRINT_PS, "Print PostScript...", "Print (PostScript)");
file_menu->Append(WXPRINT_PRINT_SETUP_PS, "Print Setup PostScript...", "Setup printer properties (PostScript)"); file_menu->Append(WXPRINT_PRINT_SETUP_PS, "Print Setup PostScript...", "Setup printer properties (PostScript)");
@@ -166,7 +166,7 @@ void MyFrame::OnExit(wxCommandEvent& event)
void MyFrame::OnPrint(wxCommandEvent& event) void MyFrame::OnPrint(wxCommandEvent& event)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS); wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else #else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT); wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -188,7 +188,7 @@ void MyFrame::OnPrintPS(wxCommandEvent& event)
void MyFrame::OnPrintPreview(wxCommandEvent& event) void MyFrame::OnPrintPreview(wxCommandEvent& event)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS); wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else #else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT); wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -228,7 +228,7 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& event)
void MyFrame::OnPrintSetup(wxCommandEvent& event) void MyFrame::OnPrintSetup(wxCommandEvent& event)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS); wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else #else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT); wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -236,7 +236,7 @@ void MyFrame::OnPrintSetup(wxCommandEvent& event)
wxPrintData data; wxPrintData data;
data.SetOrientation(orientation); data.SetOrientation(orientation);
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxPrintDialog printerDialog(this, & data); wxPrintDialog printerDialog(this, & data);
#else #else
wxGenericPrintDialog printerDialog(this, & data); wxGenericPrintDialog printerDialog(this, & data);
@@ -249,7 +249,7 @@ void MyFrame::OnPrintSetup(wxCommandEvent& event)
void MyFrame::OnPageSetup(wxCommandEvent& event) void MyFrame::OnPageSetup(wxCommandEvent& event)
{ {
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS); wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else #else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT); wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -257,7 +257,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& event)
wxPageSetupData data; wxPageSetupData data;
data.SetOrientation(orientation); data.SetOrientation(orientation);
#ifdef __WINDOWS__ #ifdef __WXMSW__
wxPageSetupDialog pageSetupDialog(this, & data); wxPageSetupDialog pageSetupDialog(this, & data);
#else #else
wxGenericPageSetupDialog pageSetupDialog(this, & data); wxGenericPageSetupDialog pageSetupDialog(this, & data);

4
samples/resource/resource.cpp
View File

@@ -42,7 +42,7 @@
// the TEXT resource, for some reason, so either run-time file loading // the TEXT resource, for some reason, so either run-time file loading
// or file inclusion should be used. // or file inclusion should be used.
#if defined(__WINDOWS__) && !defined(__BORLANDC__) && !defined(__GNUWIN32__) #if defined(__WXMSW__) && !defined(__BORLANDC__) && !defined(__GNUWIN32__)
// Under Windows, some compilers can't include // Under Windows, some compilers can't include
// a whole .wxr file. So we use a .rc user-defined resource // a whole .wxr file. So we use a .rc user-defined resource
// instead. dialog1 will point to the whole .wxr 'file'. // instead. dialog1 will point to the whole .wxr 'file'.
@@ -69,7 +69,7 @@ MyApp::MyApp()
// main frame // main frame
bool MyApp::OnInit(void) bool MyApp::OnInit(void)
{ {
#if defined(__WINDOWS__) && !defined(__BORLANDC__) #if defined(__WXMSW__) && !defined(__BORLANDC__)
// Load the .wxr 'file' from a .rc resource, under Windows. // Load the .wxr 'file' from a .rc resource, under Windows.
dialog1 = wxLoadUserResource("dialog1"); dialog1 = wxLoadUserResource("dialog1");
menu1 = wxLoadUserResource("menu1"); menu1 = wxLoadUserResource("menu1");

2
samples/splitter/test.cpp
View File

@@ -113,7 +113,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
wxFrame(frame, -1, title, pos, size) wxFrame(frame, -1, title, pos, size)
{ {
// set the icon // set the icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
SetIcon(wxIcon("mondrian")); SetIcon(wxIcon("mondrian"));
#endif #endif
#ifdef __X__ #ifdef __X__

2
samples/thread/test.cpp
View File

@@ -116,7 +116,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340); MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon // Give it an icon
#ifdef __WINDOWS__ #ifdef __WXMSW__
frame->SetIcon(wxIcon("AIAI")); frame->SetIcon(wxIcon("AIAI"));
#endif #endif
#ifdef __X__ #ifdef __X__

Some files were not shown because too many files have changed in this diff Show More