From 2049ba38adafa0ec146880de29f26e32dd69a125 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Karsten=20Ball=C3=BCder?= <ballueder@usa.net>
Date: Fri, 10 Jul 1998 14:15:17 +0000
Subject: [PATCH] Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__,
__WXMSW__ and __WXMOTIF__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
docs/symbols.txt | 10 ++++--
include/wx/app.h | 10 +++---
include/wx/bitmap.h | 6 ++--
include/wx/bmpbuttn.h | 6 ++--
include/wx/brush.h | 6 ++--
include/wx/button.h | 6 ++--
include/wx/checkbox.h | 6 ++--
include/wx/choice.h | 6 ++--
include/wx/clipbrd.h | 6 ++--
include/wx/cmndata.h | 4 +--
include/wx/colordlg.h | 6 ++--
include/wx/combobox.h | 6 ++--
include/wx/control.h | 6 ++--
include/wx/cursor.h | 6 ++--
include/wx/dc.h | 6 ++--
include/wx/dcclient.h | 6 ++--
include/wx/dcmemory.h | 6 ++--
include/wx/dcprint.h | 2 +-
include/wx/dcscreen.h | 6 ++--
include/wx/dde.h | 6 ++--
include/wx/defs.h | 34 ++++++++++----------
include/wx/dialog.h | 6 ++--
include/wx/dirdlg.h | 6 ++--
include/wx/dnd.h | 6 ++--
include/wx/filedlg.h | 6 ++--
include/wx/font.h | 6 ++--
include/wx/fontdlg.h | 6 ++--
include/wx/frame.h | 6 ++--
include/wx/gauge.h | 6 ++--
include/wx/gdicmn.h | 10 +++---
include/wx/gdiobj.h | 6 ++--
include/wx/generic/colrdlgg.h | 2 +-
include/wx/generic/helpxlp.h | 6 ++--
include/wx/generic/msgdlgg.h | 2 +-
include/wx/help.h | 8 ++---
include/wx/icon.h | 6 ++--
include/wx/imaglist.h | 6 ++--
include/wx/joystick.h | 6 ++--
include/wx/listbox.h | 6 ++--
include/wx/listctrl.h | 6 ++--
include/wx/log.h | 2 +-
include/wx/mdi.h | 6 ++--
include/wx/menu.h | 6 ++--
include/wx/metafile.h | 2 +-
include/wx/minifram.h | 6 ++--
include/wx/msgdlg.h | 6 ++--
include/wx/msw/bitmap.h | 2 +-
include/wx/notebook.h | 6 ++--
include/wx/odbc.h | 2 +-
include/wx/palette.h | 6 ++--
include/wx/pen.h | 6 ++--
include/wx/pnghand.h | 6 ++--
include/wx/postscrp.h | 2 +-
include/wx/print.h | 2 +-
include/wx/printdlg.h | 6 ++--
include/wx/radiobox.h | 6 ++--
include/wx/radiobut.h | 6 ++--
include/wx/region.h | 6 ++--
include/wx/scrolbar.h | 6 ++--
include/wx/settings.h | 6 ++--
include/wx/setup.h | 20 ++++++++++--
include/wx/slider.h | 6 ++--
include/wx/spinbutt.h | 6 ++--
include/wx/statbmp.h | 6 ++--
include/wx/statbox.h | 6 ++--
include/wx/stattext.h | 6 ++--
include/wx/tabctrl.h | 6 ++--
include/wx/tbar95.h | 6 ++--
include/wx/tbarbase.h | 2 +-
include/wx/tbarmsw.h | 6 ++--
include/wx/textctrl.h | 6 ++--
include/wx/timer.h | 6 ++--
include/wx/toolbar.h | 6 ++--
include/wx/treectrl.h | 6 ++--
include/wx/utils.h | 2 +-
include/wx/window.h | 6 ++--
install/gtk/configure | 4 +--
install/gtk/configure.in | 4 +--
samples/controls/controls.cpp | 2 +-
samples/dialogs/dialogs.cpp | 10 +++---
samples/dialogs/dialogs.h | 2 +-
samples/docview/docview.cpp | 4 +--
samples/docview/view.cpp | 2 +-
samples/dynamic/minimal.cpp | 2 +-
samples/grid/test.cpp | 4 +--
samples/internat/internat.cpp | 2 +-
samples/joytest/joytest.cpp | 2 +-
samples/layout/layout.cpp | 4 +--
samples/listctrl/listtest.cpp | 2 +-
samples/mdi/mdi.cpp | 14 ++++-----
samples/mdi/mdi.h | 6 ++--
samples/minimal/minimal.cpp | 2 +-
samples/nativdlg/dialog1.rc | 4 +--
samples/nativdlg/makefile.b32 | 2 +-
samples/nativdlg/makefile.nt | 2 +-
samples/png/pngdemo.cpp | 4 +--
samples/printing/printing.cpp | 16 +++++-----
samples/resource/resource.cpp | 4 +--
samples/splitter/test.cpp | 2 +-
samples/thread/test.cpp | 2 +-
samples/treectrl/treetest.cpp | 2 +-
samples/validate/validate.cpp | 2 +-
src/common/cmndata.cpp | 8 ++---
src/common/config.cpp | 8 ++---
src/common/date.cpp | 2 +-
src/common/datstrm.cpp | 2 +-
src/common/docview.cpp | 12 +++----
src/common/file.cpp | 2 +-
src/common/fileconf.cpp | 4 +--
src/common/filefn.cpp | 56 ++++++++++++++++-----------------
src/common/gdicmn.cpp | 18 +++++------
src/common/list.cpp | 4 +--
src/common/log.cpp | 16 +++++-----
src/common/memory.cpp | 10 +++---
src/common/odbc.cpp | 2 +-
src/common/postscrp.cpp | 30 +++++++++---------
src/common/prntbase.cpp | 10 +++---
src/common/resource.cpp | 8 ++---
src/common/string.cpp | 2 +-
src/common/tbarbase.cpp | 8 ++---
src/common/textfile.cpp | 2 +-
src/common/timercmn.cpp | 2 +-
src/common/utilscmn.cpp | 10 +++---
src/generic/gridg.cpp | 8 ++---
src/generic/helpxlp.cpp | 6 ++--
src/generic/panelg.cpp | 2 +-
src/generic/prntdlgg.cpp | 2 +-
src/generic/scrolwin.cpp | 6 ++--
src/generic/statusbr.cpp | 4 +--
src/gtk/setup/setup.hin | 2 +-
src/gtk1/setup/setup.hin | 2 +-
src/makeg95.env | 2 +-
src/makemsc.env | 8 ++---
src/makesc.env | 2 +-
src/makewat.env | 10 +++---
src/msw/app.cpp | 4 +--
src/msw/data.cpp | 28 ++++++++---------
src/msw/font.cpp | 2 +-
src/msw/helpwin.cpp | 2 +-
src/msw/makefile.b32 | 2 +-
src/msw/ownerdrw.cpp | 2 +-
src/msw/printdlg.cpp | 2 +-
src/msw/utils.cpp | 2 +-
src/msw/window.cpp | 2 +-
src/ntwxwin.mak | 8 ++---
utils/dialoged/src/dlghndlr.cpp | 2 +-
utils/dialoged/src/editrpal.cpp | 6 ++--
utils/dialoged/src/reseditr.cpp | 20 ++++++------
utils/dialoged/src/reseditr.h | 2 +-
utils/dialoged/src/reswrite.cpp | 4 +--
utils/dialoged/src/winprop.cpp | 4 +--
utils/wxprop/src/prop.cpp | 2 +-
utils/wxprop/src/propform.cpp | 2 +-
utils/wxprop/src/proplist.cpp | 6 ++--
154 files changed, 481 insertions(+), 463 deletions(-)
diff --git a/docs/symbols.txt b/docs/symbols.txt
index 1b72400ec2..40c205c897 100644
--- a/docs/symbols.txt
+++ b/docs/symbols.txt
@@ -4,11 +4,11 @@ GUIs:
-----
__X__ any X, but not GTK
-__MOTIF__ Motif
+__WXMOTIF__ Motif
__XT__ Xt; mutually exclusive with WX_MOTIF (?)
-__GTK__ GTK
+__WXGTK__ GTK
__XVIEW__ Obsolete!
-__WINDOWS__ Any Windows
+__WXMSW__ Any Windows
__MAC__ MacOS
__UNIX__ any Unix
__WIN95__ GUI for Windows 95 and above; NT 4.0 and above.
@@ -16,6 +16,10 @@ __WIN32__ WIN32 API
__NT__ Windows NT
__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:
__HPUX__
diff --git a/include/wx/app.h b/include/wx/app.h
index e4fd186486..c4a3d4ba43 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -12,22 +12,22 @@
#ifndef __APPH_BASE__
#define __APPH_BASE__
-#ifndef __GTK__
+#ifndef __WXGTK__
class WXDLLEXPORT wxApp;
typedef wxApp* (*wxAppInitializerFunction) (void);
#endif
#include "wx/object.h"
-#ifdef __GTK__
+#ifdef __WXGTK__
typedef wxObject* (*wxAppInitializerFunction) (void); // returning wxApp* won't work with gcc
#endif
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/app.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/app.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/app.h"
#endif
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index b3cf33ce7f..d1ac7ade34 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -1,11 +1,11 @@
#ifndef __BITMAPH_BASE__
#define __BITMAPH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/bitmap.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/bitmap.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/bitmap.h"
#endif
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 0f9e160d64..9c5dd47316 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -1,11 +1,11 @@
#ifndef __BMPBUTTONH_BASE__
#define __BMPBUTTONH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/bmpbuttn.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/bmpbuttn.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/bmpbuttn.h"
#endif
diff --git a/include/wx/brush.h b/include/wx/brush.h
index bc05548735..fd7657e4d6 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -1,11 +1,11 @@
#ifndef __BRUSHH_BASE__
#define __BRUSHH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/brush.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/brush.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/brush.h"
#endif
diff --git a/include/wx/button.h b/include/wx/button.h
index 950435db03..b109fc41ea 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -1,11 +1,11 @@
#ifndef __BUTTONH_BASE__
#define __BUTTONH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/button.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/button.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/button.h"
#endif
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index e4868ee671..44603e8018 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -1,11 +1,11 @@
#ifndef __CHECKBOXH_BASE__
#define __CHECKBOXH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/checkbox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/checkbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/checkbox.h"
#endif
diff --git a/include/wx/choice.h b/include/wx/choice.h
index 5a421268ed..4bda50c2f4 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -1,11 +1,11 @@
#ifndef __CHOICEH_BASE__
#define __CHOICEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/choice.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/choice.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/choice.h"
#endif
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index f5e8571912..6dbcfe87eb 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -1,11 +1,11 @@
#ifndef __CLIPBRDH_BASE__
#define __CLIPBRDH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/clipbrd.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/clipbrd.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/clipbrd.h"
#endif
diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index abb8c5da51..bb02f9ec6c 100644
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -82,7 +82,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
DECLARE_DYNAMIC_CLASS(wxPrintData)
public:
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
void *printData;
#endif
int printFromPage;
@@ -137,7 +137,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
void operator=(const wxPrintData& data);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Convert to/from the PRINTDLG structure
void ConvertToNative(void);
void ConvertFromNative(void);
diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index 8e113d039e..e3b0a04c79 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -1,11 +1,11 @@
#ifndef __COLORDLGH_BASE__
#define __COLORDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/colordlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/colrdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/colrdlgg.h"
#endif
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index e21e3af6ec..709a399e28 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -1,11 +1,11 @@
#ifndef __COMBOBOXH_BASE__
#define __COMBOBOXH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/combobox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/combobox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/combobox.h"
#endif
diff --git a/include/wx/control.h b/include/wx/control.h
index bb5003ae20..b424a69cdb 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -1,11 +1,11 @@
#ifndef __CONTROLH_BASE__
#define __CONTROLH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/control.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/control.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/control.h"
#endif
diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index b56d15ec5b..d7e15b7620 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -1,11 +1,11 @@
#ifndef __CURSORH_BASE__
#define __CURSORH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/cursor.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/cursor.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/cursor.h"
#endif
diff --git a/include/wx/dc.h b/include/wx/dc.h
index be0b417d98..8b3f3230c5 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -1,11 +1,11 @@
#ifndef __DCH_BASE__
#define __DCH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dc.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dc.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dc.h"
#endif
diff --git a/include/wx/dcclient.h b/include/wx/dcclient.h
index 795f9d0c8d..5db0f61273 100644
--- a/include/wx/dcclient.h
+++ b/include/wx/dcclient.h
@@ -1,11 +1,11 @@
#ifndef __DCCLIENTH_BASE__
#define __DCCLIENTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dcclient.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dcclient.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dcclient.h"
#endif
diff --git a/include/wx/dcmemory.h b/include/wx/dcmemory.h
index 256db8c2f9..204be5723f 100644
--- a/include/wx/dcmemory.h
+++ b/include/wx/dcmemory.h
@@ -1,11 +1,11 @@
#ifndef __DCMEMORYH_BASE__
#define __DCMEMORYH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dcmemory.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dcmemory.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dcmemory.h"
#endif
diff --git a/include/wx/dcprint.h b/include/wx/dcprint.h
index d84dd73ad8..cad351f7d8 100644
--- a/include/wx/dcprint.h
+++ b/include/wx/dcprint.h
@@ -1,7 +1,7 @@
#ifndef __DCPRINTH_BASE__
#define __DCPRINTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dcprint.h"
#endif
diff --git a/include/wx/dcscreen.h b/include/wx/dcscreen.h
index 9dde7580d3..9295477cd9 100644
--- a/include/wx/dcscreen.h
+++ b/include/wx/dcscreen.h
@@ -1,11 +1,11 @@
#ifndef __DCSCREENH_BASE__
#define __DCSCREENH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dcscreen.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dcscreen.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dcscreen.h"
#endif
diff --git a/include/wx/dde.h b/include/wx/dde.h
index e103c7882e..765190b157 100644
--- a/include/wx/dde.h
+++ b/include/wx/dde.h
@@ -1,11 +1,11 @@
#ifndef __DDEH_BASE__
#define __DDEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dde.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dde.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dde.h"
#endif
diff --git a/include/wx/defs.h b/include/wx/defs.h
index aac88fdfa9..fa02c39ec5 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -16,7 +16,7 @@
#pragma interface "defs.h"
#endif
-#ifdef __GTK__
+#ifdef __WXGTK__
#include "glib.h"
#include "gdk/gdk.h"
@@ -43,14 +43,14 @@
//////////////////////////////////////////////////////////////////////////////////
// Currently Only MS-Windows/NT, XView and Motif are supported
//
-#if defined(__HPUX__) && !defined(__MOTIF__)
-# define __MOTIF__
+#if defined(__HPUX__) && !defined(__WXMOTIF__)
+# define __WXMOTIF__
#endif
-#if defined(__MOTIF__)
+#if defined(__WXMOTIF__)
# define __X__
-#elif defined(__WINDOWS__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__)
-# ifndef __WINDOWS__
-# define __WINDOWS__
+#elif defined(__WXMSW__) || defined(__WINDOWS_386__) || defined(__NT__) || defined(__MSDOS__)
+# ifndef __WXMSW__
+# define __WXMSW__
# endif
#endif
@@ -68,13 +68,13 @@
#endif
// 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"
-#elif !defined(__MOTIF__) && !defined(__WINDOWS__) && !defined(__GTK__) && !defined(__MAC__) && !defined(__X__)
-#error "No Target! Use -D[__MOTIF__|__GTK__|__WINDOWS__|__MAC__]"
+#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__MAC__) && !defined(__X__)
+#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__MAC__]"
#endif
-#if defined(__MOTIF__) || defined(__GTK__)
+#if defined(__WXMOTIF__) || defined(__WXGTK__)
// Bool is now obsolete, use bool instead
// typedef int Bool;
@@ -85,7 +85,7 @@
# define Bool_DEFINED
#endif
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifndef TRUE
# define TRUE 1
@@ -119,7 +119,7 @@ typedef int wxWindowID;
* Making or using wxWindows as a Windows DLL
*/
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __BORLANDC__
@@ -230,8 +230,8 @@ enum ErrCode
#endif
#ifndef __UNIX__ // Windows
- #ifndef __WINDOWS__
- #define __WINDOWS__
+ #ifndef __WXMSW__
+ #define __WXMSW__
#endif
#if defined(_MSC_VER)
@@ -248,7 +248,7 @@ enum ErrCode
#if defined(__UNIX__)
#define FILE_PATH_SEPARATOR ('/')
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#define FILE_PATH_SEPARATOR ('\\')
#else
#error "don't know path separator for this platform"
@@ -833,7 +833,7 @@ enum {
#define wxID_YES 5103
#define wxID_NO 5104
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Stand-ins for Windows types, to avoid
// #including all of windows.h
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 78c9a79d88..a459bff88d 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -1,11 +1,11 @@
#ifndef __DIALOGH_BASE__
#define __DIALOGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dialog.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dialog.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dialog.h"
#endif
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index 518c9912ac..e1216cc9ca 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -1,11 +1,11 @@
#ifndef __DIRDLGH_BASE__
#define __DIRDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dirdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/dirdlg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dirdlg.h"
#endif
diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 2be49007d9..2dab36f0ba 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -1,12 +1,12 @@
#ifndef __DNDH_BASE__
#define __DNDH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/ole/dropsrc.h"
#include "wx/msw/ole/droptgt.h"
#include "wx/msw/ole/dataobj.h"
-#elif defined(__MOTIF__)
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#elif defined(__WXGTK__)
#include "wx/gtk/dnd.h"
#endif
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index f877d9b471..447b3db1b4 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -1,11 +1,11 @@
#ifndef __FILEDLGH_BASE__
#define __FILEDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/filedlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/filedlg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/filedlg.h"
#endif
diff --git a/include/wx/font.h b/include/wx/font.h
index 438c623973..bcfcccd812 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -1,11 +1,11 @@
#ifndef __FONTH_BASE__
#define __FONTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/font.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/font.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/font.h"
#endif
diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index ca180e0bfe..e30ce09aaf 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -1,11 +1,11 @@
#ifndef __FONTDLGH_BASE__
#define __FONTDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/fontdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/fontdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/fontdlgg.h"
#endif
diff --git a/include/wx/frame.h b/include/wx/frame.h
index 4b42b3ac4c..82cf407fe6 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -1,11 +1,11 @@
#ifndef __FRAMEH_BASE__
#define __FRAMEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/frame.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/frame.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/frame.h"
#endif
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index d9bdbf7faa..9bf0970bfd 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -1,11 +1,11 @@
#ifndef __GAUGEH_BASE__
#define __GAUGEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/gauge.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/gauge.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/gauge.h"
#endif
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index dec74b5bb9..f0b52eefde 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -21,11 +21,11 @@
#include "wx/hash.h"
#include "wx/setup.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/colour.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/colour.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/colour.h"
#endif
@@ -98,7 +98,7 @@ class WXDLLEXPORT wxRealPoint
class WXDLLEXPORT wxPoint
{
public:
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
int x;
int y;
#else
@@ -330,7 +330,7 @@ extern void WXDLLEXPORT wxSetCursor(const wxCursor& cursor);
// Useful macro for create icons portably
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
# define wxICON(X) wxIcon(X##_icon);
#elif defined(__X__)
# define wxICON(X) wxIcon(X##_bits, X##_width, X##_height);
diff --git a/include/wx/gdiobj.h b/include/wx/gdiobj.h
index aa3606dbdf..4b98003473 100644
--- a/include/wx/gdiobj.h
+++ b/include/wx/gdiobj.h
@@ -1,11 +1,11 @@
#ifndef __GDIOBJH_BASE__
#define __GDIOBJH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/gdiobj.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/gdiobj.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/gdiobj.h"
#endif
diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index f82865066b..6229f6d144 100644
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -116,7 +116,7 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
DECLARE_EVENT_TABLE()
};
-#ifdef __GTK__
+#ifdef __WXGTK__
typedef wxGenericColourDialog wxColourDialog;
#endif
diff --git a/include/wx/generic/helpxlp.h b/include/wx/generic/helpxlp.h
index 80587b3d07..5c0b26d257 100644
--- a/include/wx/generic/helpxlp.h
+++ b/include/wx/generic/helpxlp.h
@@ -25,7 +25,7 @@
#include "wx/helpbase.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/dde.h"
#else
// Or whatever it'll be called
@@ -38,7 +38,7 @@ class WXDLLEXPORT wxXLPHelpController;
// wxHelp process and the application
class WXDLLEXPORT wxXLPHelpConnection: public
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDDEConnection
#else
wxTCPConnection
@@ -62,7 +62,7 @@ class WXDLLEXPORT wxXLPHelpConnection: public
// controlling the wxHelp process
class WXDLLEXPORT wxXLPHelpClient: public
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDDEClient
#else
wxTCPClient
diff --git a/include/wx/generic/msgdlgg.h b/include/wx/generic/msgdlgg.h
index fb8aa5cc65..724d4c6e9d 100644
--- a/include/wx/generic/msgdlgg.h
+++ b/include/wx/generic/msgdlgg.h
@@ -40,7 +40,7 @@ public:
DECLARE_EVENT_TABLE()
};
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
#define wxMessageDialog wxGenericMessageDialog
int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
diff --git a/include/wx/help.h b/include/wx/help.h
index f1ba186db5..0fe92b70fd 100644
--- a/include/wx/help.h
+++ b/include/wx/help.h
@@ -1,18 +1,18 @@
#ifndef __HELPH_BASE__
#define __HELPH_BASE__
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/helpwin.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/helphtml.h"
#else
#include "wx/generic/helpxlp.h"
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define wxHelpController wxWinHelpController
#define classwxHelpController classwxWinHelpController
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#define wxHelpController wxHTMLHelpController
#define classwxHelpController classwxHTMLHelpController
#else
diff --git a/include/wx/icon.h b/include/wx/icon.h
index cb6bc66b60..1dbcd1443b 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,11 +1,11 @@
#ifndef __ICONH_BASE__
#define __ICONH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/icon.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/icon.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/icon.h"
#endif
diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 12774bdff4..db6b8bdcfd 100644
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -1,11 +1,11 @@
#ifndef __IMAGLISTH_BASE__
#define __IMAGLISTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/imaglist.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/imaglist.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/imaglist.h"
#endif
diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index b6aff395c6..b0ff1ef04d 100644
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -1,10 +1,10 @@
#ifndef __JOYSTICKH_BASE__
#define __JOYSTICKH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/joystick.h"
-#elif defined(__MOTIF__)
-#elif defined(__GTK__)
+#elif defined(__WXMOTIF__)
+#elif defined(__WXGTK__)
#include "wx/gtk/joystick.h"
#endif
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 545ddb54dc..582229682b 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -1,11 +1,11 @@
#ifndef __LISTBOXH_BASE__
#define __LISTBOXH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/listbox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/listbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/listbox.h"
#endif
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 1025f70334..72f594add6 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -1,11 +1,11 @@
#ifndef __LISTCTRLH_BASE__
#define __LISTCTRLH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/listctrl.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/listctrl.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/listctrl.h"
#endif
diff --git a/include/wx/log.h b/include/wx/log.h
index bad161e60f..353a3cd688 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -42,7 +42,7 @@ enum
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation
#define wxTraceRefCount 0x0008 // trace various ref counting operations
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define wxTraceOleCalls 0x0100 // OLE interface calls
#endif
diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index fade7fa0dd..39298703cc 100644
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -1,11 +1,11 @@
#ifndef __MDIH_BASE__
#define __MDIH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/mdi.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/mdi.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/mdi.h"
#endif
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 9a9335729d..f845f4a5e3 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -1,11 +1,11 @@
#ifndef __MENUH_BASE__
#define __MENUH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/menu.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/menu.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/menu.h"
#endif
diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 20e53dd894..d3eefe4240 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -1,7 +1,7 @@
#ifndef __METAFILEH_BASE__
#define __METAFILEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/metafile.h"
#endif
diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index d340f57307..7a00d5d74d 100644
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -1,11 +1,11 @@
#ifndef __MINIFRAMH_BASE__
#define __MINIFRAMH_BASE_
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/minifram.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/minifram.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/minifram.h"
#endif
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index 0771b4631b..28587a318c 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -1,11 +1,11 @@
#ifndef __MSGDLGH_BASE__
#define __MSGDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/msgdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/msgdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/msgdlgg.h"
#endif
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h
index 4610024f79..cbe8b012fc 100644
--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -79,7 +79,7 @@ public:
wxPalette m_bitmapPalette;
int m_quality;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
WXHBITMAP m_hBitmap;
wxDC * m_selectedInto; // So bitmap knows whether it's been selected into
// a device context (for error checking)
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index e84263f72d..92e99ec7e8 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -1,11 +1,11 @@
#ifndef __NOTEBOOKH_BASE__
#define __NOTEBOOKH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/notebook.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#error "wxNotebook not implemented under Motif"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/notebook.h"
#endif
diff --git a/include/wx/odbc.h b/include/wx/odbc.h
index 934e46270b..ba9d3220ca 100644
--- a/include/wx/odbc.h
+++ b/include/wx/odbc.h
@@ -20,7 +20,7 @@
#ifndef __ODBCH__
#define __ODBCH__
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
diff --git a/include/wx/palette.h b/include/wx/palette.h
index 1dbae83aa4..3c268a4ace 100644
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -1,11 +1,11 @@
#ifndef __PALETTEH_BASE__
#define __PALETTEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/palette.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/palette.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/palette.h"
#endif
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 7a61d50a2a..77c60965d9 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -1,11 +1,11 @@
#ifndef __PENH_BASE__
#define __PENH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/pen.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/pen.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/pen.h"
#endif
diff --git a/include/wx/pnghand.h b/include/wx/pnghand.h
index 9ee53318d8..a7b71c7693 100644
--- a/include/wx/pnghand.h
+++ b/include/wx/pnghand.h
@@ -1,11 +1,11 @@
#ifndef __PNGHANDH_BASE__
#define __PNGHANDH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/pnghand.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/pnghand.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/pnghand.h"
#endif
diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index 16f231d2c8..e8b72bdd69 100644
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
// RR: I define these in wxDC, after all they all do the same everywhere
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Splines
// 3-point spline
void DrawSpline(long x1, long y1, long x2, long y2, long x3, long y3);
diff --git a/include/wx/print.h b/include/wx/print.h
index 0eeee4fe6a..e0d05230f4 100644
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -1,7 +1,7 @@
#ifndef __PRINTH_BASE__
#define __PRINTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/printwin.h"
#ifndef wxPrinter
diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 9570bfb9fe..bd0e58ccd0 100644
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,11 +1,11 @@
#ifndef __PRINTDLGH_BASE__
#define __PRINTDLGH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/printdlg.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/prntdlgg.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/prntdlgg.h"
#endif
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index a3d0c0737a..fb37c4cf48 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -1,11 +1,11 @@
#ifndef __RADIOBOXH_BASE__
#define __RADIOBOXH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/radiobox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/radiobox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/radiobox.h"
#endif
diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index f6a4eaeb84..f3278b999d 100644
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -1,11 +1,11 @@
#ifndef __RADIOBUTH_BASE__
#define __RADIOBUTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/radiobut.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/radiobut.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/radiobut.h"
#endif
diff --git a/include/wx/region.h b/include/wx/region.h
index aa208368f3..7ac6569277 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -1,11 +1,11 @@
#ifndef __REGIONH_BASE__
#define __REGIONH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/region.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/region.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/region.h"
#endif
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index fa67805e0d..50bdbf947a 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -1,11 +1,11 @@
#ifndef __SCROLBARH_BASE__
#define __SCROLBARH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/scrolbar.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/scrolbar.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/scrolbar.h"
#endif
diff --git a/include/wx/settings.h b/include/wx/settings.h
index a3f1901ba8..2bccf12fbb 100644
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -104,11 +104,11 @@
#define wxSYS_SHOW_SOUNDS 36
#define wxSYS_SWAP_BUTTONS 37
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/settings.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/settings.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/settings.h"
#endif
diff --git a/include/wx/setup.h b/include/wx/setup.h
index 2f0e6abc46..9eef8da3ef 100644
--- a/include/wx/setup.h
+++ b/include/wx/setup.h
@@ -2,11 +2,25 @@
#ifndef __SETUPH_BASE__
#define __SETUPH_BASE__
-#if defined(__WINDOWS__)
+// compatibility code, to be removed asap:
+
+#if ! defined(__WXMSW__) && ! defined(__WXGTK__) && ! defined(__WXMOTIF__)
+# if defined(__WINDOWS__)
+# define __WXMSW__
+# 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(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/setup.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/setup.h"
#endif
diff --git a/include/wx/slider.h b/include/wx/slider.h
index 2161341a97..2aa7485212 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -1,11 +1,11 @@
#ifndef __SLIDERH_BASE__
#define __SLIDERH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/slider.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/slider.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/slider.h"
#endif
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 839e13d1f5..1e0b6090a1 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -1,11 +1,11 @@
#ifndef __SPINBUTTH_BASE__
#define __SPINBUTTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/spinbutt.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/spinbutt.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/spinbutt.h"
#endif
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index c2f90dd1bb..b7464113ee 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -1,11 +1,11 @@
#ifndef __STATBMPH_BASE__
#define __STATBMPH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/statbmp.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/statbmp.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/statbmp.h"
#endif
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index cf7d4d36bc..345a214307 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -1,11 +1,11 @@
#ifndef __STATBOXH_BASE__
#define __STATBOXH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/statbox.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/statbox.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/statbox.h"
#endif
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index 0c30862324..0cf342680b 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -1,11 +1,11 @@
#ifndef __STATTEXTH_BASE__
#define __STATTEXTH_BASE_
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/stattext.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/stattext.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/stattext.h"
#endif
diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index a007866ed7..13306d2212 100644
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -1,11 +1,11 @@
#ifndef __TABCTRLH_BASE__
#define __TABCTRLH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/tabctrl.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/tabctrl.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#endif
#endif
diff --git a/include/wx/tbar95.h b/include/wx/tbar95.h
index 8025f6b42b..eee04659aa 100644
--- a/include/wx/tbar95.h
+++ b/include/wx/tbar95.h
@@ -1,11 +1,11 @@
#ifndef __TBAR95H_BASE__
#define __TBAR95H_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/tbar95.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/tbar95.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/tbar95.h"
#endif
diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h
index b410ac6a82..c1b0ce3ad0 100644
--- a/include/wx/tbarbase.h
+++ b/include/wx/tbarbase.h
@@ -188,7 +188,7 @@ class WXDLLEXPORT wxToolBarBase : public wxControl
void OnIdle(wxIdleEvent& event);
// Required to force normal cursor-setting behaviour in Windows
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
virtual void MSWOnMouseMove(int x, int y, const WXUINT flags);
#endif
diff --git a/include/wx/tbarmsw.h b/include/wx/tbarmsw.h
index 7923368419..7e5f343b86 100644
--- a/include/wx/tbarmsw.h
+++ b/include/wx/tbarmsw.h
@@ -1,11 +1,11 @@
#ifndef __TBARMSWH_BASE__
#define __TBARMSWH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/tbarmsw.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/tbarmsw.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/tbarmsw.h"
#endif
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index bbe414be2d..40508446ac 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -1,11 +1,11 @@
#ifndef __TEXTCTRLH_BASE__
#define __TEXTCTRLH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/textctrl.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/textctrl.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/textctrl.h"
#endif
diff --git a/include/wx/timer.h b/include/wx/timer.h
index 3dbe809312..609cc33ace 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -1,11 +1,11 @@
#ifndef __TIMERH_BASE__
#define __TIMERH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/timer.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/timer.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/timer.h"
#endif
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index b4fe589c17..7d4111f2d5 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,15 +1,15 @@
#ifndef _TOOLBAR_H_BASE_
#define _TOOLBAR_H_BASE_
-#if defined(__WINDOWS__) && defined(__WIN95__)
+#if defined(__WXMSW__) && defined(__WIN95__)
# include "wx/tbar95.h"
# define wxToolBar wxToolBar95
# define classwxToolBar classwxToolBar95
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
# include "wx/tbarmsw.h"
# define wxToolBar wxToolBarMSW
# define classwxToolBar classwxToolBarMSW
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h"
# define classwxToolBar wxToolBarGTK
#endif
diff --git a/include/wx/treectrl.h b/include/wx/treectrl.h
index e167d56f6b..bb4644ccff 100644
--- a/include/wx/treectrl.h
+++ b/include/wx/treectrl.h
@@ -1,11 +1,11 @@
#ifndef __TREECTRLH_BASE__
#define __TREECTRLH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/treectrl.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/generic/treectrl.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/generic/treectrl.h"
#endif
diff --git a/include/wx/utils.h b/include/wx/utils.h
index e2ef6fd635..a8603a3fc8 100644
--- a/include/wx/utils.h
+++ b/include/wx/utils.h
@@ -266,7 +266,7 @@ void WXDLLEXPORT wxGetMousePosition( int* x, int* y );
// MSW only: get user-defined resource from the .res file.
// Returns NULL or newly-allocated memory, so use delete[] to clean up.
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
extern const char* WXDLLEXPORT wxUserResourceStr;
char* WXDLLEXPORT wxLoadUserResource(const wxString& resourceName, const wxString& resourceType = wxUserResourceStr);
#endif
diff --git a/include/wx/window.h b/include/wx/window.h
index 578ba0881b..ebc9c3ba7c 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1,11 +1,11 @@
#ifndef __WINDOWH_BASE__
#define __WINDOWH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/window.h"
-#elif defined(__MOTIF__)
+#elif defined(__WXMOTIF__)
#include "wx/xt/window.h"
-#elif defined(__GTK__)
+#elif defined(__WXGTK__)
#include "wx/gtk/window.h"
#endif
diff --git a/install/gtk/configure b/install/gtk/configure
index d3f8edce88..1a68a3f106 100755
--- a/install/gtk/configure
+++ b/install/gtk/configure
@@ -4232,7 +4232,7 @@ USE_GTK=1
USE_UNIX=1
TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
USE_LINUX=
USE_SGI=
@@ -6111,7 +6111,7 @@ fi
cat >> confdefs.h <<\EOF
-#define __GTK__ 1
+#define __WXGTK__ 1
EOF
fi
diff --git a/install/gtk/configure.in b/install/gtk/configure.in
index f9c327edbd..05b71a014a 100644
--- a/install/gtk/configure.in
+++ b/install/gtk/configure.in
@@ -593,7 +593,7 @@ USE_GTK=1
USE_UNIX=1
TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
USE_LINUX=
USE_SGI=
@@ -1180,7 +1180,7 @@ if test "$USE_GTK" = 1; then
GUI_TK_INCLUDE="$GTK_CFLAGS"
GUI_TK_LIBRARY="$GTK_LIBS"
], AC_MSG_ERROR(Are gtk-config and the GTK in path and up-to-date?))
- AC_DEFINE(__GTK__)
+ AC_DEFINE(__WXGTK__)
fi
AC_SUBST(GUI_TK_INCLUDE)
AC_SUBST(GUI_TK_LIBRARY)
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index ac37f68652..004eff2b84 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -91,7 +91,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Controls wxWindows App", 50, 50, 500, 420 );
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp
index 5d4ddf64ee..939efa6cb8 100644
--- a/samples/dialogs/dialogs.cpp
+++ b/samples/dialogs/dialogs.cpp
@@ -31,7 +31,7 @@
#include <wx/fontdlg.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/fontdlgg.h>
#endif
@@ -60,14 +60,14 @@ bool MyApp::OnInit(void)
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)");
#endif
file_menu->AppendSeparator();
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)");
#endif
@@ -143,7 +143,7 @@ void MyFrame::ChooseFont(wxCommandEvent& event)
dialog->Close();
}
-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
void MyFrame::ChooseColourGeneric(wxCommandEvent& event)
{
wxColourData data;
@@ -286,7 +286,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_MENU(DIALOGS_FILE_OPEN, MyFrame::FileOpen)
EVT_MENU(DIALOGS_FILE_SAVE, MyFrame::FileSave)
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_FONT_GENERIC, MyFrame::ChooseFontGeneric)
#endif
diff --git a/samples/dialogs/dialogs.h b/samples/dialogs/dialogs.h
index 39c199a35a..d3745c423c 100644
--- a/samples/dialogs/dialogs.h
+++ b/samples/dialogs/dialogs.h
@@ -37,7 +37,7 @@ class MyFrame: public wxFrame
void FileSave(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 ChooseFontGeneric(wxCommandEvent& event);
#endif
diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index a36407e97c..075238f442 100644
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -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);
//// Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("doc_icn"));
#endif
#ifdef __X__
@@ -171,7 +171,7 @@ wxFrame *MyApp::CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas)
wxDocChildFrame *subframe = new wxDocChildFrame(doc, view, GetMainFrame(), "Child Frame",
wxPoint(10, 10), wxSize(300, 300), wxDEFAULT_FRAME_STYLE);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
subframe->SetIcon(wxString(isCanvas ? "chrt_icn" : "notepad_icn"));
#endif
#ifdef __X__
diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index d604b6fa32..15784e23f6 100644
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -105,7 +105,7 @@ void DrawingView::OnUpdate(wxView *sender, wxObject *hint)
canvas->Refresh();
/* Is the following necessary?
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (canvas)
canvas->Refresh();
#else
diff --git a/samples/dynamic/minimal.cpp b/samples/dynamic/minimal.cpp
index 0015847436..71359b2952 100644
--- a/samples/dynamic/minimal.cpp
+++ b/samples/dynamic/minimal.cpp
@@ -60,7 +60,7 @@ bool MyApp::OnInit(void)
frame->Connect( MINIMAL_ABOUT, -1, wxEVT_COMMAND_MENU_SELECTED, (wxObjectEventFunction)MyFrame::OnAbout );
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/grid/test.cpp b/samples/grid/test.cpp
index 6cfcf2b9b6..013983c366 100644
--- a/samples/grid/test.cpp
+++ b/samples/grid/test.cpp
@@ -88,7 +88,7 @@ IMPLEMENT_APP(MyApp)
// `Main program' equivalent, creating windows and returning main app frame
bool MyApp::OnInit(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
cellBitmap1 = new wxBitmap("bitmap1");
cellBitmap2 = new wxBitmap("bitmap2");
#endif
@@ -97,7 +97,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "wxGrid Sample", wxPoint(50, 50), wxSize(450, 300));
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index e8e4fd5812..9bcf7ae964 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -87,7 +87,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 6ec7c6fa53..862663ff30 100644
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -55,7 +55,7 @@ bool MyApp::OnInit(void)
wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("joyicon"));
#endif
#ifdef __X__
diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 7cf0458e7b..c5318f1abd 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -52,7 +52,7 @@ bool MyApp::OnInit(void)
frame->CreateStatusBar(2);
// Load icon and bitmap
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn"));
#endif
#ifdef __X__
@@ -186,7 +186,7 @@ void MyFrame::LoadFile(wxCommandEvent& event)
char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
if (s)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->text_window->LoadFile(s);
#endif
}
diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 24ee28c00b..d51ecae827 100644
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -66,7 +66,7 @@ bool MyApp::OnInit(void)
frame->SetBackgroundColour(wxColour(255, 255, 255));
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/mdi/mdi.cpp b/samples/mdi/mdi.cpp
index 588f0260bd..ed177ee94b 100644
--- a/samples/mdi/mdi.cpp
+++ b/samples/mdi/mdi.cpp
@@ -21,7 +21,7 @@
#include "wx/mdi.h"
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __WIN95__
#include <wx/tbar95.h>
#else
@@ -51,7 +51,7 @@ bool MyApp::OnInit(void)
wxDEFAULT_FRAME | wxHSCROLL | wxVSCROLL);
// Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mdi_icn"));
#endif
#ifdef __X__
@@ -100,7 +100,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
wxTE_MULTILINE|wxSUNKEN_BORDER);
textWindow->SetValue("A help window");
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
toolBar = new TestRibbon(this, 0, 0, 100, 30, wxNO_BORDER, wxVERTICAL, 1);
SetToolBar(toolBar);
#endif
@@ -128,7 +128,7 @@ void MyFrame::OnNewWindow(wxCommandEvent& event)
winNumber ++;
// Give it an icon (this is ignored in MDI mode: uses resources)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
subframe->SetIcon(wxIcon("chrt_icn"));
#endif
#ifdef __X__
@@ -252,7 +252,7 @@ void MyFrame::OnSize(wxSizeEvent& event)
int tw = 0;
int th = 0;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxWindow* tbar = GetToolBar();
if (tbar)
{
@@ -302,7 +302,7 @@ bool MyChild::OnClose(void)
return TRUE;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
BEGIN_EVENT_TABLE(TestRibbon, wxToolBar)
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[7] = new wxBitmap("icon8", wxBITMAP_TYPE_RESOURCE);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int width = 24;
#else
int width = 16;
diff --git a/samples/mdi/mdi.h b/samples/mdi/mdi.h
index e33dd98f12..3773699422 100644
--- a/samples/mdi/mdi.h
+++ b/samples/mdi/mdi.h
@@ -9,7 +9,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __WIN95__
#define wxToolBar wxToolBar95
#else
@@ -34,7 +34,7 @@ class MyCanvas: public wxScrolledWindow
DECLARE_EVENT_TABLE()
};
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
class TestRibbon: public wxToolBar
{
@@ -56,7 +56,7 @@ class MyFrame: public wxMDIParentFrame
public:
wxTextCtrl *textWindow;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
TestRibbon* toolBar;
#endif
diff --git a/samples/minimal/minimal.cpp b/samples/minimal/minimal.cpp
index 86a0e89965..623245f6ae 100644
--- a/samples/minimal/minimal.cpp
+++ b/samples/minimal/minimal.cpp
@@ -65,7 +65,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc
index 412338aaa1..11c75fe589 100644
--- a/samples/nativdlg/dialog1.rc
+++ b/samples/nativdlg/dialog1.rc
@@ -1,8 +1,8 @@
//Microsoft Developer Studio generated resource script.
//
-#ifndef __WINDOWS__
-#define __WINDOWS__
+#ifndef __WXMSW__
+#define __WXMSW__
#endif
#ifndef __WIN32__
diff --git a/samples/nativdlg/makefile.b32 b/samples/nativdlg/makefile.b32
index 7c55473a6a..0d75d38135 100644
--- a/samples/nativdlg/makefile.b32
+++ b/samples/nativdlg/makefile.b32
@@ -52,7 +52,7 @@ $(TARGET).def
nativdlg.obj: nativdlg.$(SRCSUFF) nativdlg.h # dialog1.wxr
$(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:
-erase *.obj
diff --git a/samples/nativdlg/makefile.nt b/samples/nativdlg/makefile.nt
index 08261497f8..b143f84a28 100644
--- a/samples/nativdlg/makefile.nt
+++ b/samples/nativdlg/makefile.nt
@@ -50,7 +50,7 @@ $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
<<
$(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:
diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index ed0c27b774..05fb32d7ef 100644
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -20,7 +20,7 @@
#pragma hdrstop
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <wx/pnghand.h>
#endif
@@ -37,7 +37,7 @@ MyApp::MyApp()
bool MyApp::OnInit(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap::AddHandler(new wxPNGFileHandler);
#endif
diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index d11143d205..14e1fb48c5 100644
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -81,7 +81,7 @@ bool MyApp::OnInit(void)
frame->CreateStatusBar(2);
// Load icon and bitmap
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn"));
#endif
#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_PREVIEW, "Print Pre&view", "Preview");
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
file_menu->AppendSeparator();
file_menu->Append(WXPRINT_PRINT_PS, "Print PostScript...", "Print (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)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -188,7 +188,7 @@ void MyFrame::OnPrintPS(wxCommandEvent& event)
void MyFrame::OnPrintPreview(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -228,7 +228,7 @@ void MyFrame::OnPrintPreviewPS(wxCommandEvent& event)
void MyFrame::OnPrintSetup(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -236,7 +236,7 @@ void MyFrame::OnPrintSetup(wxCommandEvent& event)
wxPrintData data;
data.SetOrientation(orientation);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxPrintDialog printerDialog(this, & data);
#else
wxGenericPrintDialog printerDialog(this, & data);
@@ -249,7 +249,7 @@ void MyFrame::OnPrintSetup(wxCommandEvent& event)
void MyFrame::OnPageSetup(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
@@ -257,7 +257,7 @@ void MyFrame::OnPageSetup(wxCommandEvent& event)
wxPageSetupData data;
data.SetOrientation(orientation);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxPageSetupDialog pageSetupDialog(this, & data);
#else
wxGenericPageSetupDialog pageSetupDialog(this, & data);
diff --git a/samples/resource/resource.cpp b/samples/resource/resource.cpp
index 89952f18ea..461cea563b 100644
--- a/samples/resource/resource.cpp
+++ b/samples/resource/resource.cpp
@@ -42,7 +42,7 @@
// the TEXT resource, for some reason, so either run-time file loading
// 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
// a whole .wxr file. So we use a .rc user-defined resource
// instead. dialog1 will point to the whole .wxr 'file'.
@@ -69,7 +69,7 @@ MyApp::MyApp()
// main frame
bool MyApp::OnInit(void)
{
-#if defined(__WINDOWS__) && !defined(__BORLANDC__)
+#if defined(__WXMSW__) && !defined(__BORLANDC__)
// Load the .wxr 'file' from a .rc resource, under Windows.
dialog1 = wxLoadUserResource("dialog1");
menu1 = wxLoadUserResource("menu1");
diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index ba3732986c..d626b81e18 100644
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -113,7 +113,7 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
wxFrame(frame, -1, title, pos, size)
{
// set the icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/thread/test.cpp b/samples/thread/test.cpp
index 61d3ef5e7b..21730f7da7 100644
--- a/samples/thread/test.cpp
+++ b/samples/thread/test.cpp
@@ -116,7 +116,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Minimal wxWindows App", 50, 50, 450, 340);
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("AIAI"));
#endif
#ifdef __X__
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 690e648d37..f162be97ae 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -63,7 +63,7 @@ bool MyApp::OnInit(void)
frame->SetBackgroundColour(wxColour(255, 255, 255));
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 70e5c07232..b7bde3e173 100644
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -44,7 +44,7 @@ bool MyApp::OnInit(void)
MyFrame *frame = new MyFrame(NULL, "Validation Test", 50, 50, 300, 250);
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index e19b0aa713..b3e4eb2c21 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -29,7 +29,7 @@
#include "wx/gdicmn.h"
#include "wx/cmndata.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifndef __WIN32__
@@ -127,7 +127,7 @@ void wxFontData::operator=(const wxFontData& data)
wxPrintData::wxPrintData(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
printData = NULL;
#endif
printOrientation = wxPORTRAIT;
@@ -148,7 +148,7 @@ wxPrintData::wxPrintData(void)
wxPrintData::~wxPrintData(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
PRINTDLG *pd = (PRINTDLG *)printData;
if ( pd && pd->hDevMode )
GlobalFree(pd->hDevMode);
@@ -157,7 +157,7 @@ wxPrintData::~wxPrintData(void)
#endif
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
void wxPrintData::ConvertToNative(void)
{
PRINTDLG *pd = (PRINTDLG*) printData;
diff --git a/src/common/config.cpp b/src/common/config.cpp
index 96f6a9c197..9f70f2069f 100644
--- a/src/common/config.cpp
+++ b/src/common/config.cpp
@@ -136,7 +136,7 @@ wxString ExpandEnvVars(const wxString& str)
Bracket_None,
Bracket_Normal = ')',
Bracket_Curly = '}',
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-)
#endif
};
@@ -144,13 +144,13 @@ wxString ExpandEnvVars(const wxString& str)
uint m;
for ( uint n = 0; n < str.Len(); n++ ) {
switch ( str[n] ) {
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
case '%':
#endif //WINDOWS
case '$':
{
Bracket bracket;
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
if ( str[n] == '%' )
bracket = Bracket_Windows;
else
@@ -188,7 +188,7 @@ wxString ExpandEnvVars(const wxString& str)
}
else {
// variable doesn't exist => don't change anything
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
if ( bracket != Bracket_Windows )
#endif
if ( bracket != Bracket_None )
diff --git a/src/common/date.cpp b/src/common/date.cpp
index 7ac9ec8641..158aca78c8 100644
--- a/src/common/date.cpp
+++ b/src/common/date.cpp
@@ -466,7 +466,7 @@ bool wxDate::IsLeapYear( void ) const
wxDate& wxDate::Set()
{
-//#ifdef __WINDOWS__
+//#ifdef __WXMSW__
#if 0
struct _dosdate_t sDate;
_dos_getdate(&sDate);
diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 17f2100ebe..df9095cdff 100644
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -173,7 +173,7 @@ void wxDataStream::Write8(unsigned char i)
void wxDataStream::WriteLine(const wxString& line)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxString tmp_string = line + "\r\n";
#else
wxString tmp_string = line + '\n';
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 81d86a85a2..9671a5cf2c 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -44,7 +44,7 @@
#include "wx/generic/printps.h"
/*
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/mdi.h"
#endif
*/
@@ -491,7 +491,7 @@ void wxView::OnChangeFilename(void)
// If the frame is an MDI child, just set the title
// to the name.
// Otherwise, append the document name to the name of the application
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (GetFrame()->IsKindOf(CLASSINFO(wxMDIChildFrame)))
#else
if (FALSE)
@@ -753,7 +753,7 @@ void wxDocManager::OnPrint(wxCommandEvent& WXUNUSED(event))
{
// TODO: trouble about this is that it pulls in the postscript
// code unecessarily
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
{
wxWindowsPrinter printer;
@@ -779,7 +779,7 @@ void wxDocManager::OnPrintSetup(wxCommandEvent& WXUNUSED(event))
wxPrintData data;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
{
wxPrintDialog printerDialog(parentWin, & data);
@@ -806,7 +806,7 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
{
// Pass two printout objects: for preview, and possible printing.
wxPrintPreviewBase *preview = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
preview = new wxWindowsPrintPreview(printout, view->OnCreatePrintout());
else
@@ -1126,7 +1126,7 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
int noTemplates, wxString& path, long WXUNUSED(flags), bool WXUNUSED(save))
{
// We can only have multiple filters in Windows
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
char *descrBuf = new char[1000];
descrBuf[0] = 0;
int i;
diff --git a/src/common/file.cpp b/src/common/file.cpp
index e6a8a9c878..52a39d4d34 100644
--- a/src/common/file.cpp
+++ b/src/common/file.cpp
@@ -27,7 +27,7 @@
#endif
// standard
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <io.h>
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index f2e2c35e03..2482693f65 100644
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -40,8 +40,8 @@
#include <wx/fileconf.h>
// _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if defined(__WINDOWS__) && !defined(_WINDOWS_)
+// __WXMSW__ is defined for MS Windows compilation
+#if defined(__WXMSW__) && !defined(_WINDOWS_)
#include <windows.h>
#endif //windows.h
diff --git a/src/common/filefn.cpp b/src/common/filefn.cpp
index b47d856e66..2a17499d5e 100644
--- a/src/common/filefn.cpp
+++ b/src/common/filefn.cpp
@@ -45,7 +45,7 @@
#include <dirent.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifndef __GNUWIN32__
#include <direct.h>
#include <dos.h>
@@ -69,7 +69,7 @@
#include <dir.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
@@ -90,7 +90,7 @@ void wxPathList::Add (const wxString& path)
void wxPathList::AddEnvList (const wxString& envVariable)
{
static const char PATH_TOKS[] =
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
" ;"; // Don't seperate with colon in DOS (used for drive)
#else
" :;";
@@ -135,7 +135,7 @@ bool wxPathList::Member (const wxString& path)
{
wxString path2((char *) node->Data ());
if (
-#if defined(__WINDOWS__) || defined(__VMS__)
+#if defined(__WXMSW__) || defined(__VMS__)
// Case INDEPENDENT
path.CompareTo (path2, wxString::ignoreCase) == 0
#else
@@ -166,7 +166,7 @@ wxString wxPathList::FindValidPath (const wxString& file)
if (ch != '\\' && ch != '/')
strcat (wxBuffer, "/");
strcat (wxBuffer, filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Unix2DosFilename (wxBuffer);
#endif
if (wxFileExists (wxBuffer))
@@ -193,7 +193,7 @@ wxString wxPathList::FindAbsoluteValidPath (const wxString& file)
lastCh = buf[len-1];
if (lastCh != '/' && lastCh != '\\')
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
strcat(buf, "\\");
#else
strcat(buf, "/");
@@ -236,7 +236,7 @@ wxIsAbsolutePath (const wxString& filename)
#ifdef __VMS__
|| (filename[0] == '[' && filename[1] != '.')
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
/* MSDOS */
|| filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
#endif
@@ -270,7 +270,7 @@ void wxStripExtension(char *buffer)
// Destructive removal of /./ and /../ stuff
char *wxRealPath (char *path)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
static const char SEP = '\\';
Unix2DosFilename(path);
#else
@@ -300,7 +300,7 @@ char *wxRealPath (char *path)
path[0] = SEP;
path[1] = '\0';
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
/* Check that path[2] is NULL! */
else if (path[1] == ':' && !path[2])
{
@@ -330,7 +330,7 @@ char *wxCopyAbsolutePath(const wxString& filename)
buf[0] = '\0';
wxGetWorkingDirectory(buf, sizeof(buf)/sizeof(char));
char ch = buf[strlen(buf) - 1];
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (ch != '\\' && ch != '/')
strcat(buf, "\\");
#else
@@ -381,7 +381,7 @@ char *wxExpandPath(char *buf, const char *name)
trimchars[2] = '\t';
trimchars[3] = 0;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
const char SEP = '\\';
#else
const char SEP = '/';
@@ -402,7 +402,7 @@ char *wxExpandPath(char *buf, const char *name)
s = nm;
d = lnm;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
q = FALSE;
#else
q = nm[0] == '\\' && nm[1] == '~';
@@ -410,7 +410,7 @@ char *wxExpandPath(char *buf, const char *name)
/* Expand inline environment variables */
while ((*d++ = *s)) {
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
if (*s == '\\') {
if ((*(d - 1) = *++s)) {
s++;
@@ -419,7 +419,7 @@ char *wxExpandPath(char *buf, const char *name)
break;
} else
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (*s++ == '$' && (*s == '{' || *s == ')'))
#else
if (*s++ == '$')
@@ -510,7 +510,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
return NULL;
strcpy (dest, WXSTRINGCAST filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Unix2DosFilename(dest);
#endif
@@ -537,7 +537,7 @@ wxContractPath (const wxString& filename, const wxString& envname, const wxStrin
strcpy(wxBuffer, "~");
if (user && *user)
strcat(wxBuffer, user);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// strcat(wxBuffer, "\\");
#else
// strcat(wxBuffer, "/");
@@ -568,7 +568,7 @@ char *wxFileNameFromPath (char *path)
#endif
return tcp + 1;
} /* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
return path + 2;
#endif
@@ -595,7 +595,7 @@ wxString wxFileNameFromPath (const wxString& path1)
#endif
return wxString(tcp + 1);
} /* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
return wxString(path + 2);
#endif
@@ -637,7 +637,7 @@ wxPathOnly (char *path)
else i --;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
{
@@ -685,7 +685,7 @@ wxString wxPathOnly (const wxString& path)
else i --;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
{
@@ -712,7 +712,7 @@ wxDos2UnixFilename (char *s)
{
if (*s == '\\')
*s = '/';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else
*s = wxToLower (*s); // Case INDEPENDENT
#endif
@@ -724,7 +724,7 @@ void
wxUnix2DosFilename (char *s)
{
// Yes, I really mean this to happen under DOS only! JACS
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (s)
while (*s)
{
@@ -826,7 +826,7 @@ bool wxMkdir(const wxString& dir)
{
#ifdef __VMS__
return FALSE;
-#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WINDOWS__)
+#elif (defined(__GNUWIN32__) && !defined(__MINGW32__)) || !defined(__WXMSW__)
return (mkdir (WXSTRINGCAST dir, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
#else
return (mkdir(WXSTRINGCAST dir) == 0);
@@ -847,7 +847,7 @@ bool wxDirExists(const wxString& dir)
{
#ifdef __VMS__
return FALSE;
-#elif !defined(__WINDOWS__)
+#elif !defined(__WXMSW__)
struct stat sbuf;
return (stat(dir, &sbuf) != -1) && S_ISDIR(sbuf.st_mode) ? TRUE : FALSE;
#else
@@ -904,7 +904,7 @@ bool wxPathExists(const char *pszPathName)
// Get a temporary filename, opening and closing the file.
char *wxGetTempFileName(const wxString& prefix, char *buf)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifndef __WIN32__
char tmp[144];
@@ -1051,7 +1051,7 @@ char *wxFindNextFile(void)
return NULL;
}
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifdef __WIN32__
HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE;
@@ -1216,7 +1216,7 @@ char *wxFindNextFile(void)
}
#endif
- // __WINDOWS__
+ // __WXMSW__
// Get current working directory.
// If buf is NULL, allocates space using new, else
@@ -1240,7 +1240,7 @@ bool wxSetWorkingDirectory(const wxString& d)
{
#ifdef __UNIX__
return (chdir(d) == 0);
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifdef __WIN32__
return (bool)(SetCurrentDirectory(d) != 0);
diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 7ab3528f6c..a30a772c7a 100644
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,7 +31,7 @@
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
@@ -146,7 +146,7 @@ void wxColourDatabase::Initialize ()
cdef cc;
static cdef table[]={
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
{"AQUAMARINE",112, 219, 147},
{"BLACK",0, 0, 0},
{"BLUE", 0, 0, 255},
@@ -220,7 +220,7 @@ void wxColourDatabase::Initialize ()
{"YELLOW GREEN", 153, 204, 50},
#endif
-#if defined(__GTK__) || defined(__X__)
+#if defined(__WXGTK__) || defined(__X__)
{"MEDIUM GOLDENROD", 234, 234, 173},
{"MEDIUM FOREST GREEN", 107, 142, 35},
{"LIGHT MAGENTA", 255, 0, 255},
@@ -252,11 +252,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
if (node)
return (wxColour *)node->Data();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else return NULL;
#endif
-#ifdef __GTK__
+#ifdef __WXGTK__
else {
wxColour *col = new wxColour( colour );
@@ -273,7 +273,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
else {
XColor xcolour;
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
Display *display = XtDisplay(wxTheApp->topLevel) ;
#endif
#ifdef __XVIEW__
@@ -326,7 +326,7 @@ wxInitializeStockObjects ()
wxTheFontList = new wxFontList;
wxTheBitmapList = new wxBitmapList;
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
#endif
#ifdef __X__
wxFontPool = new XFontPool;
@@ -542,7 +542,7 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
wxFontList::~wxFontList ()
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxNode *node = First ();
while (node)
{
@@ -585,7 +585,7 @@ wxFont *wxFontList::
each_font->GetStyle () == Style &&
each_font->GetWeight () == Weight &&
each_font->GetUnderlined () == underline &&
-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
each_font->GetFontId () == FamilyOrFontId) /* New font system */
#else
each_font->GetFamily () == FamilyOrFontId &&
diff --git a/src/common/list.cpp b/src/common/list.cpp
index 728c8c483d..b4d2ab7410 100644
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -174,7 +174,7 @@ wxList::wxList (wxObject * first_one...)
{
wxObject *object = va_arg (ap, wxObject *);
// if (object == NULL) // Doesn't work in Windows -- segment is non-zero for NULL!
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ((int) object == 0)
#else
if ((long) object == 0)
@@ -525,7 +525,7 @@ wxStringList::wxStringList (const char *first...)
{
char *s = va_arg (ap, char *);
// if (s == NULL)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ((int) s == 0)
#else
if ((long) s == 0)
diff --git a/src/common/log.cpp b/src/common/log.cpp
index 1c266afcb5..62a70119a0 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -47,7 +47,7 @@
#include <stdlib.h>
#include <time.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#else //Unix
#include <signal.h>
@@ -359,7 +359,7 @@ void wxLogStream::DoLogString(const char *szString)
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
+#ifndef __WXGTK__
: wxLogStream(new ostream(pTextCtrl))
#endif //GTK
{
@@ -367,7 +367,7 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
wxLogTextCtrl::~wxLogTextCtrl()
{
- #ifndef __GTK__
+ #ifndef __WXGTK__
delete m_ostr;
#endif //GTK
}
@@ -619,7 +619,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
// retrieve text and save it
// -------------------------
-#ifdef __GTK__
+#ifdef __WXGTK__
// @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
wxLogError("Sorry, this function is not implemented under GTK");
#else
@@ -678,7 +678,7 @@ void wxLogWindow::DoLogString(const char *szString)
wxTextCtrl *pText = m_pLogFrame->TextCtrl();
// remove selection (WriteText is in fact ReplaceSelection)
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
long nLen = pText->GetLastPosition();
pText->SetSelection(nLen, nLen);
#endif // Windows
@@ -751,7 +751,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
// get error code from syste
unsigned long wxSysErrorCode()
{
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
#ifdef __WIN32__
return ::GetLastError();
#else //WIN16
@@ -769,7 +769,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
#ifdef __WIN32__
static char s_szBuf[LOG_BUFFER_SIZE / 2];
@@ -838,7 +838,7 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
switch ( wxMessageBox(szBuf, _("Debug"),
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
case wxYES:
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
DebugBreak();
#else // Unix
raise(SIGTRAP);
diff --git a/src/common/memory.cpp b/src/common/memory.cpp
index 819dea4bcb..ce4aec4926 100644
--- a/src/common/memory.cpp
+++ b/src/common/memory.cpp
@@ -51,7 +51,7 @@
#include <stdarg.h>
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifdef GetClassInfo
@@ -1021,7 +1021,7 @@ void wxTrace(const char *fmt ...)
va_start(ap, fmt);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
@@ -1035,7 +1035,7 @@ void wxTrace(const char *fmt ...)
wxDebugContext::GetStream().flush();
}
else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)buffer) ;
#else
fprintf(stderr, buffer);
@@ -1053,7 +1053,7 @@ void wxTraceLevel(int level, const char *fmt ...)
va_start(ap, fmt);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
@@ -1067,7 +1067,7 @@ void wxTraceLevel(int level, const char *fmt ...)
wxDebugContext::GetStream().flush();
}
else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)buffer) ;
#else
fprintf(stderr, buffer);
diff --git a/src/common/odbc.cpp b/src/common/odbc.cpp
index 7335397b84..67768ac38e 100644
--- a/src/common/odbc.cpp
+++ b/src/common/odbc.cpp
@@ -36,7 +36,7 @@
#include <math.h>
#include <stdlib.h>
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
#include <print.h>
#endif
diff --git a/src/common/postscrp.cpp b/src/common/postscrp.cpp
index 84f5daeaf5..3ab71e83d8 100644
--- a/src/common/postscrp.cpp
+++ b/src/common/postscrp.cpp
@@ -44,7 +44,7 @@
#include "wx/dcmemory.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/private.h"
#endif
@@ -62,7 +62,7 @@
#include <limits.h>
#include <assert.h>
-#ifdef __GTK__
+#ifdef __WXGTK__
#include "gdk/gdkx.h" // GDK_DISPLAY
#include "gdk/gdkprivate.h" // XImage
@@ -71,7 +71,7 @@
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef DrawText
#undef DrawText
@@ -105,7 +105,7 @@
// SGI's Display Postscript Previewer
//# define PS_VIEWER_PROG "dps"
# define PS_VIEWER_PROG "xpsview"
-#elif defined(__X__) || defined(__GTK__)
+#elif defined(__X__) || defined(__WXGTK__)
// Front-end to ghostscript
# define PS_VIEWER_PROG "ghostview"
#else
@@ -175,7 +175,7 @@ wxPostScriptDC::wxPostScriptDC (void)
m_pstream = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Can only send to file in Windows
wxThePrintSetupData->SetPrinterMode(PS_FILE);
#endif
@@ -205,7 +205,7 @@ bool wxPostScriptDC::Create(const wxString& file, bool interactive, wxWindow *pa
m_filename = file;
m_pstream = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Can only send to file in Windows
wxThePrintSetupData->SetPrinterMode(PS_FILE);
#endif
@@ -669,7 +669,7 @@ void wxPostScriptDC::DrawEllipse (long x, long y, long width, long height)
void wxPostScriptDC::DrawIcon (const wxIcon& icon, long x, long y)
{
-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
wxMemoryDC memDC;
memDC.SelectObject(icon);
Blit(x, y, icon.GetWidth(), icon.GetHeight(), &memDC, 0, 0);
@@ -1272,7 +1272,7 @@ void wxPostScriptDC::EndDoc (void)
wxRemoveFile (wxThePrintSetupData->GetPrinterFile());
wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile());
-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
if (m_ok)
{
switch (wxThePrintSetupData->GetPrinterMode()) {
@@ -1406,7 +1406,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
{
long width, height, x, y;
-#if !defined(__X__) && !defined(__GTK__)
+#if !defined(__X__) && !defined(__WXGTK__)
return FALSE;
#endif
@@ -1428,7 +1428,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
*m_pstream << " currentfile DataString readhexstring pop\n";
*m_pstream << "} bind image\n";
-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
/* Output data as hex digits: */
Display *d;
@@ -1437,7 +1437,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
long j, i;
char s[3];
-#ifdef __GTK__
+#ifdef __WXGTK__
d = gdk_display;
cm = ((GdkColormapPrivate*)gdk_colormap_get_system())->xcolormap;
@@ -1446,7 +1446,7 @@ Blit (long xdest, long ydest, long fwidth, long fheight,
#else
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
d = source->display;
#else
d = wxGetDisplay();
@@ -2082,7 +2082,7 @@ wxDialog(parent, -1, title, pos, size, style)
wxRadioBox *radio1 = new wxRadioBox(this, wxID_PRINTER_MODES, "PostScript:",
wxPoint(150, yPos), wxSize(-1,-1), features, print_modes, features, 0);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
radio1->Enable(0, FALSE);
if (wxThePrintSetupData->GetPrintPreviewCommand() && *wxThePrintSetupData->GetPrintPreviewCommand())
radio1->Enable(2, FALSE);
@@ -2491,12 +2491,12 @@ void wxInitializePrintSetupData(bool init)
wxThePrintSetupData->SetPrinterOptions("/nonotify/queue=psqueue");
wxThePrintSetupData->SetAFMPath("sys$ps_font_metrics:");
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxThePrintSetupData->SetPrinterCommand("print");
wxThePrintSetupData->SetAFMPath("c:\\windows\\system\\");
wxThePrintSetupData->SetPrinterOptions(NULL);
#endif
-#if !defined(__VMS__) && !defined(__WINDOWS__)
+#if !defined(__VMS__) && !defined(__WXMSW__)
wxThePrintSetupData->SetPrinterCommand("lpr");
wxThePrintSetupData->SetPrinterOptions(NULL);
wxThePrintSetupData->SetAFMPath(NULL);
diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp
index df27ba6a65..99dcfbc57d 100644
--- a/src/common/prntbase.cpp
+++ b/src/common/prntbase.cpp
@@ -22,7 +22,7 @@
#include "wx/defs.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define __GOOD_COMPILER__
#endif
@@ -47,7 +47,7 @@
#include <stdlib.h>
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#include <commdlg.h>
@@ -77,7 +77,7 @@ typedef signed short int SHORT ;
LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
#endif
- // End __WINDOWS__
+ // End __WXMSW__
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterBase, wxObject)
@@ -337,7 +337,7 @@ void wxPreviewControlBar::CreateButtons(void)
SetSize(0, 0, 400, 40);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int fontSize = 9;
#else
int fontSize = 10;
@@ -484,7 +484,7 @@ void wxPreviewFrame::Initialize(void)
// int w, h;
// controlBar->GetSize(&w, &h);
int h;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
h = 40;
#else
h = 60;
diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 181854d597..cd045b2810 100644
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -2090,7 +2090,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
}
break;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2165,7 +2165,7 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
}
case wxBITMAP_TYPE_XPM_DATA:
{
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
+#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
@@ -2263,7 +2263,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
}
break;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
@@ -2340,7 +2340,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
{
// *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
/*
-#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WINDOWS__) && USE_XPM_IN_MSW)
+#if (defined(__X__) && USE_XPM_IN_X) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
wxItemResource *item = table->FindResource(name);
if (!item)
{
diff --git a/src/common/string.cpp b/src/common/string.cpp
index 3e5e41f2d6..1c8cd5319c 100644
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -907,7 +907,7 @@ int wxString::Scanf(const char *pszFormat, ...) const
int wxString::ScanfV(const char *pszFormat, va_list argptr) const
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxMessageBox("ScanfV not implemented");
return 0;
#else
diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp
index 60de3c71a3..b7322ac3f9 100644
--- a/src/common/tbarbase.cpp
+++ b/src/common/tbarbase.cpp
@@ -25,7 +25,7 @@
#endif
// For ::UpdateWindow
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
@@ -500,7 +500,7 @@ void wxToolBarBase::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
}
AdjustScrollbars();
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
::UpdateWindow ((HWND) GetHWND());
#endif
}
@@ -755,7 +755,7 @@ void wxToolBarBase::Scroll (int x_pos, int y_pos)
SetScrollPos (wxVERTICAL, y_pos, TRUE);
}
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
UpdateWindow ((HWND) GetHWND());
#endif
}
@@ -827,7 +827,7 @@ void wxToolBarBase::DoToolbarUpdates(void)
}
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
{
diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp
index ca7235c4e9..4347c0618b 100644
--- a/src/common/textfile.cpp
+++ b/src/common/textfile.cpp
@@ -39,7 +39,7 @@
// default type is the native one
const wxTextFile::Type wxTextFile::typeDefault = wxTextFile::
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
Type_Dos;
#elif defined(__UNIX__)
Type_Unix;
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index a13496beff..a1e02d73a3 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -144,7 +144,7 @@ bool wxGetLocalTime(long *timeZone, int *dstObserved)
*dstObserved = tp->tm_isdst;
#else
-#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WINDOWS__)) && !defined(__GNUWIN32__))
+#if (((defined(__SYSV__) && !defined(__HPUX__)) || defined(__MSDOS__) || defined(__WXMSW__)) && !defined(__GNUWIN32__))
#ifdef __BORLANDC__
/* Borland uses underscores */
*timeZone = _timezone;
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 349d6f04a0..235b5c1460 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -56,7 +56,7 @@
#include "../common/glob.inc"
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
@@ -109,7 +109,7 @@ int strncasecmp(const char *str_1, const char *str_2, size_t maxchar)
}
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifndef __GNUWIN32__
#define strcasecmp stricmp
@@ -134,7 +134,7 @@ extern "C"
int strncasecmp (const char *, const char *, size_t);
}
#endif
-#endif /* __WINDOWS__ */
+#endif /* __WXMSW__ */
char *
@@ -519,7 +519,7 @@ int wxDebugStreamBuf::overflow(int WXUNUSED(i))
char *txt = new char[len+1];
strncpy(txt, pbase(), len);
txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)txt);
#else
fprintf(stderr, txt);
@@ -535,7 +535,7 @@ int wxDebugStreamBuf::sync(void)
char *txt = new char[len+1];
strncpy(txt, pbase(), len);
txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)txt);
#else
fprintf(stderr, txt);
diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index cb34fb1325..9c3ff80d3a 100644
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -32,7 +32,7 @@
#include "wx/settings.h"
// Set to zero to use no double-buffering
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define USE_DOUBLE_BUFFERING 1
#else
#define USE_DOUBLE_BUFFERING 0
@@ -840,7 +840,7 @@ void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int
{
dc->SetBrush(*cell->GetBackgroundBrush());
dc->SetPen(*wxTRANSPARENT_PEN);
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
dc->DrawRectangle(rect->x+1, rect->y+1, rect->width-1, rect->height-1);
#else
dc->DrawRectangle(rect->x+1, rect->y+1, rect->width, rect->height);
@@ -1371,7 +1371,7 @@ void wxGenericGrid::OnSelectCellImplementation(wxDC *dc, int row, int col)
// Why isn't this needed for Windows??
// Probably because of the SetValue??
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
HighlightCell(dc);
#endif
dc->DestroyClippingRegion();
@@ -1751,7 +1751,7 @@ void wxGenericGrid::RefreshCell(int row, int col, bool setText)
currentPos = TRUE;
}
// Gets refreshed anyway in MSW
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (!currentPos)
#endif
{
diff --git a/src/generic/helpxlp.cpp b/src/generic/helpxlp.cpp
index 0487ac5cfd..7cf6872a82 100644
--- a/src/generic/helpxlp.cpp
+++ b/src/generic/helpxlp.cpp
@@ -55,7 +55,7 @@
#if !USE_SHARED_LIBRARY
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
#else
@@ -189,7 +189,7 @@ bool wxXLPHelpController::Run(void)
if (!helpFile || !helpHost || helpRunning)
return FALSE;
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (!helpFile || helpRunning)
return FALSE;
#endif
@@ -208,7 +208,7 @@ bool wxXLPHelpController::Run(void)
char server[32];
sprintf(server, "%d", helpServer);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Only one instance of wxHelp under Windows.
// See if there's already an instance of wxHelp
if ((helpConnection = (wxXLPHelpConnection *)helpClient.MakeConnection(helpHost, server, "WXHELP")))
diff --git a/src/generic/panelg.cpp b/src/generic/panelg.cpp
index 05bd8acb9d..537816c80d 100644
--- a/src/generic/panelg.cpp
+++ b/src/generic/panelg.cpp
@@ -93,7 +93,7 @@ void wxPanel::OnNavigationKey(wxNavigationKeyEvent& event)
wxWindow *winFocus = event.GetCurrentFocus();
// @@@ no FindFocus() in wxGTK
- #ifndef __GTK__
+ #ifndef __WXGTK__
if ( winFocus == NULL )
winFocus = wxWindow::FindFocus();
#endif
diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index cfbd632c42..cf3e8a61ff 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -425,7 +425,7 @@ void wxGenericPageSetupDialog::OnPrinter(wxCommandEvent& WXUNUSED(event))
genericPrintSetupDialog->Close(TRUE);
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else
{
wxPrintData data;
diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index 8cabb75feb..fa2bfe3740 100644
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -20,7 +20,7 @@
#include "wx/utils.h"
#include "wx/dcclient.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
@@ -103,7 +103,7 @@ void wxScrolledWindow::SetScrollbars (int pixelsPerUnitX, int pixelsPerUnitY,
if (do_refresh && !noRefresh) Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
UpdateWindow ((HWND) GetHWND());
#endif
}
@@ -403,7 +403,7 @@ void wxScrolledWindow::Scroll (int x_pos, int y_pos)
SetScrollPos (wxVERTICAL, y_pos, TRUE);
}
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
::UpdateWindow ((HWND) GetHWND());
#endif
}
diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index 2f5c66c8f0..5e2d82f92b 100644
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -29,7 +29,7 @@
#include "wx/generic/statusbr.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifdef DrawText
@@ -123,7 +123,7 @@ void wxStatusBar::SetStatusText(const wxString& text, int number)
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// For some reason, this can cause major GDI problems - graphics
// all over the place. E.g. in print previewing.
// ::UpdateWindow((HWND) GetHWND());
diff --git a/src/gtk/setup/setup.hin b/src/gtk/setup/setup.hin
index 57c0e17ea4..95fef3444b 100644
--- a/src/gtk/setup/setup.hin
+++ b/src/gtk/setup/setup.hin
@@ -21,7 +21,7 @@
#endif
/* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
#undef __UNIX__
#undef __LINUX__
#undef __SGI__
diff --git a/src/gtk1/setup/setup.hin b/src/gtk1/setup/setup.hin
index 57c0e17ea4..95fef3444b 100644
--- a/src/gtk1/setup/setup.hin
+++ b/src/gtk1/setup/setup.hin
@@ -21,7 +21,7 @@
#endif
/* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
#undef __UNIX__
#undef __LINUX__
#undef __SGI__
diff --git a/src/makeg95.env b/src/makeg95.env
index 84ced2d245..df75642221 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -113,7 +113,7 @@ WARN = -Wall
# -Wredudant-decs
# Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WINDOWS__
+GUI = -D__WXMSW__
# Optimization
# OPT = -O
diff --git a/src/makemsc.env b/src/makemsc.env
index 99305c33db..d30e9badd2 100644
--- 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)
-CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__
+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__
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__WINDOWS__ $(PRECOMP)
-CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /AL /Gt4 /Gx- /W4 /G2s /GD $(OPT) /D__WINDOWS__
+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__
LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE
DUMMY=dummydll
!endif
diff --git a/src/makesc.env b/src/makesc.env
index c10cc56f39..9c3455bff6 100644
--- a/src/makesc.env
+++ b/src/makesc.env
@@ -12,7 +12,7 @@ OBJSUFF = obj
CC=sc
RC=rc
-CFLAGS = -o -ml -W -D__WINDOWS__
+CFLAGS = -o -ml -W -D__WXMSW__
LDFLAGS = -ml -W
.$(SRCSUFF).obj:
diff --git a/src/makewat.env b/src/makewat.env
index 19b8babfaf..8a668d85b2 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -54,8 +54,8 @@ RESFLAGS1 = -r -bt=windows /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
RESFLAGS2 = -R $(name) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
DEBUGINFO = debug all
-#CPPFLAGS = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END WIN386 MODE
@@ -88,8 +88,8 @@ DEBUGINFO = debug all
# or we get link failure (TEXT segment overflow). Is this OK for
# 32-bit mode also? -- JACS
# An alternative might be /zc (put string literals in code segment).
-#CPPFLAGS = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END WINDOWS MODE
@@ -130,7 +130,7 @@ DEBUGINFO = debug all # Linking: comment out if operating in a non-debuggable
OPTFLAGS=/ox /5r # /DWXDEBUG=1
# /d1 for line numbers only: anything else produces an enormous wx32.lib
-CPPFLAGS = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WINDOWS__ $(EXTRACPPFLAGS)
+CPPFLAGS = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WXMSW__ $(EXTRACPPFLAGS)
!endif
#### END NT MODE
diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 40327418c1..12111a86fc 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -337,7 +337,7 @@ void wxApp::CleanUp()
void wxApp::CommonInit()
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBuffer = new char[1500];
#else
wxBuffer = new char[BUFSIZ + 512];
@@ -648,7 +648,7 @@ wxApp::wxApp()
m_appName = "";
argc = 0;
argv = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
m_printMode = wxPRINT_WINDOWS;
#else
m_printMode = wxPRINT_POSTSCRIPT;
diff --git a/src/msw/data.cpp b/src/msw/data.cpp
index fc65da6e17..a692201c45 100644
--- a/src/msw/data.cpp
+++ b/src/msw/data.cpp
@@ -148,7 +148,7 @@ const char *wxFatalErrorStr = "wxWindows Fatal Error";
const char *wxFloatToStringStr = "%.2f";
const char *wxDoubleToStringStr = "%.2f";
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
const char *wxUserResourceStr = "TEXT";
#endif
@@ -201,7 +201,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxDC)
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC, wxDC)
IMPLEMENT_DYNAMIC_CLASS(wxScreenDC, wxWindowDC)
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/dcprint.h"
IMPLEMENT_CLASS(wxPrinterDC, wxDC)
#endif
@@ -225,7 +225,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
#include "wx/colordlg.h"
#include "wx/fontdlg.h"
-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#include "wx/generic/colordlg.h"
#include "wx/generic/fontdlg.h"
IMPLEMENT_DYNAMIC_CLASS(wxGenericColourDialog, wxDialog)
@@ -268,7 +268,7 @@ IMPLEMENT_CLASS(wxHelpControllerBase, wxObject)
#if USE_HELP
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/helpwin.h"
IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
#endif
@@ -276,7 +276,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
// Generic wxHelp controller
IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
#else
@@ -397,7 +397,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxToolBarBase, wxControl)
#include "wx/tbarsmpl.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/tbarmsw.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
@@ -426,7 +426,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxTime, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxString, wxObject)
#endif
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
IMPLEMENT_DYNAMIC_CLASS(wxXColormap, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxXFont, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxXCursor, wxObject)
@@ -441,7 +441,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxBitmap, wxGDIObject)
IMPLEMENT_DYNAMIC_CLASS(wxMask, wxObject)
// This will presumably be implemented on other platforms too
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_DYNAMIC_CLASS(wxBitmapHandler, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxBMPResourceHandler, wxBitmapHandler)
IMPLEMENT_DYNAMIC_CLASS(wxBMPFileHandler, wxBitmapHandler)
@@ -537,7 +537,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPanel, wxWindow)
#include "wx/dirdlg.h"
#include "wx/choicdlg.h"
-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
#include "wx/generic/msgdlgg.h"
IMPLEMENT_CLASS(wxGenericMessageDialog, wxDialog)
#endif
@@ -547,12 +547,12 @@ IMPLEMENT_CLASS(wxSingleChoiceDialog, wxDialog)
IMPLEMENT_CLASS(wxFileDialog, wxDialog)
IMPLEMENT_CLASS(wxDirDialog, wxDialog)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_CLASS(wxMessageDialog)
#endif
#if USE_GAUGE
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
#include "../../contrib/xmgauge/gauge.h"
#endif
#include "wx_gauge.h"
@@ -615,7 +615,7 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
EVT_ERASE_BACKGROUND(wxTextCtrl::OnEraseBackground)
END_EVENT_TABLE()
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
BEGIN_EVENT_TABLE(wxMDIParentWindow, wxFrame)
EVT_SIZE(wxMDIParentWindow::OnSize)
EVT_ACTIVATE(wxMDIParentWindow::OnActivate)
@@ -640,7 +640,7 @@ BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
EVT_MOUSE_EVENTS(wxToolBarSimple::OnMouseEvent)
END_EVENT_TABLE()
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
BEGIN_EVENT_TABLE(wxToolBarMSW, wxToolBarBase)
EVT_SIZE(wxToolBarMSW::OnSize)
EVT_PAINT(wxToolBarMSW::OnPaint)
@@ -669,7 +669,7 @@ BEGIN_EVENT_TABLE(wxControl, wxWindow)
EVT_ERASE_BACKGROUND(wxControl::OnEraseBackground)
END_EVENT_TABLE()
-#if !defined(__WINDOWS__) || USE_GENERIC_DIALOGS_IN_MSW
+#if !defined(__WXMSW__) || USE_GENERIC_DIALOGS_IN_MSW
BEGIN_EVENT_TABLE(wxGenericMessageDialog, wxDialog)
EVT_BUTTON(wxID_YES, wxGenericMessageDialog::OnYes)
EVT_BUTTON(wxID_NO, wxGenericMessageDialog::OnNo)
diff --git a/src/msw/font.cpp b/src/msw/font.cpp
index 4541dbf2f6..66a9fdbb79 100644
--- a/src/msw/font.cpp
+++ b/src/msw/font.cpp
@@ -146,7 +146,7 @@ bool wxFont::RealizeResource(void)
else if (M_FONTDATA->m_weight == wxBOLD)
ff_weight = FW_BOLD;
-#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
+#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
ff_face = wxTheFontNameDirectory.GetScreenName(M_FONTDATA->m_family, M_FONTDATA->m_weight, M_FONTDATA->m_style);
#else
ff_face = M_FONTDATA->m_faceName;
diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index 9e1e6a5997..808a63ffcf 100644
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -29,7 +29,7 @@
#if USE_HELP
#include <time.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <wx/msw/private.h>
#endif
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 23dbe73e4d..75d427e83a 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -553,7 +553,7 @@ $(CFG): makefile.b32
-L$(BCCDIR)\lib
-D__WXWIN__
--D__WINDOWS__
+-D__WXMSW__
-DWIN32
$(OPT)
$(DEBUG_FLAGS)
diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp
index 87e3ba77b6..84249668ad 100644
--- a/src/msw/ownerdrw.cpp
+++ b/src/msw/ownerdrw.cpp
@@ -45,7 +45,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxTString& str,
m_nMarginWidth = ms_nLastMarginWidth;
}
-#if defined(__WINDOWS__) && defined(__WIN32__)
+#if defined(__WXMSW__) && defined(__WIN32__)
uint wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK);
#else // # what is the reasonable default?
uint wxOwnerDrawn::ms_nDefaultMarginWidth = 15;
diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp
index 0bc12eff29..143e0f1603 100644
--- a/src/msw/printdlg.cpp
+++ b/src/msw/printdlg.cpp
@@ -79,7 +79,7 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintData* data)
if ( data )
printData = *data;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
printData.SetOwnerWindow(p);
#endif
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index 4c4fe57837..9ce007ee4d 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -559,7 +559,7 @@ bool wxCheckForInterrupt(wxWindow *wnd)
// MSW only: get user-defined resource from the .res file.
// Returns NULL or newly-allocated memory, so use delete[] to clean up.
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
char *wxLoadUserResource(const wxString& resourceName, const wxString& resourceType)
{
char *s = NULL;
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index bfa74f9f0b..8201299729 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4355,7 +4355,7 @@ void wxWindow::OnChar(wxKeyEvent& event)
if (vert_units)
y_pages = (int)(v_height/vert_units) - y_page;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int y = 0;
#else
int y = y_page-1;
diff --git a/src/ntwxwin.mak b/src/ntwxwin.mak
index 8dcc6e4dc4..05c19284cf 100644
--- a/src/ntwxwin.mak
+++ b/src/ntwxwin.mak
@@ -141,9 +141,9 @@ PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
MAKEPRECOMP=/YcWX/WXPREC.H
!endif
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
# If you don't include wxprec.h, use CPPFLAGS2
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ /DDEBUG=1 $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) /MD /GX /D__DEBUG__
LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup
DUMMY=dummy
@@ -158,8 +158,8 @@ DUMMY=dummy
!endif
PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb
-CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WINDOWS__ $(INC) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
-CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WINDOWS__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
+CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL /MT $(EXTRADLLFLAGS) /D_WINDOWS /D_WINDLL
LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY)
!endif
diff --git a/utils/dialoged/src/dlghndlr.cpp b/utils/dialoged/src/dlghndlr.cpp
index f27188ac94..7eb928ae6a 100644
--- a/utils/dialoged/src/dlghndlr.cpp
+++ b/utils/dialoged/src/dlghndlr.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
diff --git a/utils/dialoged/src/editrpal.cpp b/utils/dialoged/src/editrpal.cpp
index b73b693cdb..570bf6a8a4 100644
--- a/utils/dialoged/src/editrpal.cpp
+++ b/utils/dialoged/src/editrpal.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
@@ -194,7 +194,7 @@ void EditorToolPalette::OnPaint(wxPaintEvent& event)
EditorToolPalette *wxResourceManager::OnCreatePalette(wxFrame *parent)
{
// Load palette bitmaps
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap PaletteMessageBitmap("MESSAGETOOL");
wxBitmap PaletteButtonBitmap("BUTTONTOOL");
wxBitmap PaletteCheckBoxBitmap("CHECKBOXTOOL");
@@ -234,7 +234,7 @@ EditorToolPalette *wxResourceManager::OnCreatePalette(wxFrame *parent)
palette->SetMargins(2, 2);
/*
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (palette->IsKindOf(CLASSINFO(wxToolBarMSW)))
((wxToolBarMSW *)palette)->SetDefaultSize(22, 22);
#endif
diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index 4193ebde82..cf8c3cb282 100644
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -41,13 +41,13 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
@@ -133,7 +133,7 @@ wxResourceManager::~wxResourceManager()
bool wxResourceManager::Initialize()
{
// Set up the resource filename for each platform.
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// dialoged.ini in the Windows directory
char buf[256];
GetWindowsDirectory(buf, 256);
@@ -159,7 +159,7 @@ bool wxResourceManager::Initialize()
if (!m_bitmapImage)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
#ifdef __X__
@@ -168,7 +168,7 @@ bool wxResourceManager::Initialize()
}
// Initialize the image list icons
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxIcon icon1("DIALOG_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
wxIcon icon2("FOLDER1_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
wxIcon icon3("FOLDER2_ICON", wxBITMAP_TYPE_ICO_RESOURCE, 16, 16);
@@ -598,7 +598,7 @@ wxFrame *wxResourceManager::OnCreateEditorFrame(const char *title)
frame->CreateStatusBar(1);
frame->SetAutoLayout(TRUE);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxIcon *icon = new wxIcon("DIALOGEDICON");
frame->SetIcon(icon);
#endif
@@ -651,7 +651,7 @@ wxResourceEditorScrolledWindow *wxResourceManager::OnCreateEditorPanel(wxFrame *
wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
{
// Load palette bitmaps
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap ToolbarLoadBitmap("LOADTOOL");
wxBitmap ToolbarSaveBitmap("SAVETOOL");
wxBitmap ToolbarNewBitmap("NEWTOOL");
@@ -688,7 +688,7 @@ wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
toolbar->SetMargins(2, 2);
// toolbar->GetDC()->SetBackground(wxLIGHT_GREY_BRUSH);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int width = 24;
int dx = 2;
int gap = 6;
@@ -759,7 +759,7 @@ void wxResourceManager::UpdateResourceList()
m_editorResourceTree->DeleteAllItems();
long id = m_editorResourceTree->InsertItem(0, "Dialogs"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
, 1, 2
#endif
);
@@ -792,7 +792,7 @@ void wxResourceManager::AddItemsRecursively(long parent, wxItemResource *resourc
imageId = 3;
long id = m_editorResourceTree->InsertItem(parent, theString
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
, imageId
#endif
);
diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h
index c2dcec4453..c5f07132af 100644
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -72,7 +72,7 @@ class wxWindowPropertyInfo;
class wxResourceEditorProjectTree;
class wxResourceEditorControlList;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define wxHelpController wxWinHelpController
#else
#define wxHelpController wxXLPHelpController;
diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp
index 2b560e4a5d..eef90e684c 100644
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
@@ -401,7 +401,7 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
char buf[400];
strcpy(buf, child->GetName());
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDos2UnixFilename(buf);
#endif
diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp
index f65018724b..4e43b02a45 100644
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -29,13 +29,13 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
diff --git a/utils/wxprop/src/prop.cpp b/utils/wxprop/src/prop.cpp
index 32e68f547b..4bd8d72efe 100644
--- a/utils/wxprop/src/prop.cpp
+++ b/utils/wxprop/src/prop.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
diff --git a/utils/wxprop/src/propform.cpp b/utils/wxprop/src/propform.cpp
index e4ba770c2f..ac5aed868f 100644
--- a/utils/wxprop/src/propform.cpp
+++ b/utils/wxprop/src/propform.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
diff --git a/utils/wxprop/src/proplist.cpp b/utils/wxprop/src/proplist.cpp
index 0690210c7a..2b8ba2555b 100644
--- a/utils/wxprop/src/proplist.cpp
+++ b/utils/wxprop/src/proplist.cpp
@@ -29,7 +29,7 @@
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
@@ -165,7 +165,7 @@ bool wxPropertyListView::UpdatePropertyDisplayInList(wxProperty *property)
return FALSE;
int currentlySelected = propertyScrollingList->GetSelection();
-// #ifdef __WINDOWS__
+// #ifdef __WXMSW__
wxString stringValueRepr(property->GetValue().GetStringRepresentation());
wxString paddedString(MakeNameValueString(property->GetName(), stringValueRepr));
int sel = FindListIndexForProperty(property);
@@ -496,7 +496,7 @@ bool wxPropertyListView::CreateControls(void)
/*
if (!tickBitmap)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
tickBitmap = new wxBitmap("tick_bmp", wxBITMAP_TYPE_RESOURCE);
crossBitmap = new wxBitmap("cross_bmp", wxBITMAP_TYPE_RESOURCE);
if (!tickBitmap || !crossBitmap || !tickBitmap->Ok() || !crossBitmap->Ok())
--
2.47.2