-----
__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.
__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__
#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
#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
#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
#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
#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
#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
#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
#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
DECLARE_DYNAMIC_CLASS(wxPrintData)
public:
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
void *printData;
#endif
int printFromPage;
void operator=(const wxPrintData& data);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Convert to/from the PRINTDLG structure
void ConvertToNative(void);
void ConvertFromNative(void);
#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
#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
#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
#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
#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
#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
#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
#ifndef __DCPRINTH_BASE__
#define __DCPRINTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/dcprint.h"
#endif
#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
#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
#pragma interface "defs.h"
#endif
-#ifdef __GTK__
+#ifdef __WXGTK__
#include "glib.h"
#include "gdk/gdk.h"
//////////////////////////////////////////////////////////////////////////////////
// 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
#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;
# define Bool_DEFINED
#endif
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifndef TRUE
# define TRUE 1
* Making or using wxWindows as a Windows DLL
*/
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __BORLANDC__
#endif
#ifndef __UNIX__ // Windows
- #ifndef __WINDOWS__
- #define __WINDOWS__
+ #ifndef __WXMSW__
+ #define __WXMSW__
#endif
#if defined(_MSC_VER)
#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"
#define wxID_YES 5103
#define wxID_NO 5104
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Stand-ins for Windows types, to avoid
// #including all of windows.h
#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
#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
#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
#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
#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
#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
#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
#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
#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
class WXDLLEXPORT wxPoint
{
public:
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
int x;
int y;
#else
// 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);
#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
DECLARE_EVENT_TABLE()
};
-#ifdef __GTK__
+#ifdef __WXGTK__
typedef wxGenericColourDialog wxColourDialog;
#endif
#include "wx/helpbase.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/dde.h"
#else
// Or whatever it'll be called
// wxHelp process and the application
class WXDLLEXPORT wxXLPHelpConnection: public
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDDEConnection
#else
wxTCPConnection
// controlling the wxHelp process
class WXDLLEXPORT wxXLPHelpClient: public
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDDEClient
#else
wxTCPClient
DECLARE_EVENT_TABLE()
};
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
#define wxMessageDialog wxGenericMessageDialog
int wxMessageBox(const wxString& message, const wxString& caption = wxMessageBoxCaptionStr,
#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
#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
#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
#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
#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
#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
#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
#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
#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
#ifndef __METAFILEH_BASE__
#define __METAFILEH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/metafile.h"
#endif
#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
#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
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)
#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
#ifndef __ODBCH__
#define __ODBCH__
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
#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
#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
#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
// 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);
#ifndef __PRINTH_BASE__
#define __PRINTH_BASE__
-#if defined(__WINDOWS__)
+#if defined(__WXMSW__)
#include "wx/msw/printwin.h"
#ifndef wxPrinter
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
#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
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
#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
#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
#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
#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
#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
// 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
#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
USE_UNIX=1
TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
USE_LINUX=
USE_SGI=
cat >> confdefs.h <<\EOF
-#define __GTK__ 1
+#define __WXGTK__ 1
EOF
fi
USE_UNIX=1
TOOLKIT=GTK
-TOOLKIT_DEF=__GTK__
+TOOLKIT_DEF=__WXGTK__
USE_LINUX=
USE_SGI=
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)
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__
#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
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
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;
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
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
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__
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__
canvas->Refresh();
/* Is the following necessary?
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (canvas)
canvas->Refresh();
#else
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__
// `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
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__
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__
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__
frame->CreateStatusBar(2);
// Load icon and bitmap
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn"));
#endif
#ifdef __X__
char *s = wxFileSelector("Load text file", NULL, NULL, NULL, "*.txt");
if (s)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->text_window->LoadFile(s);
#endif
}
frame->SetBackgroundColour(wxColour(255, 255, 255));
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
#include "wx/mdi.h"
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __WIN95__
#include <wx/tbar95.h>
#else
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__
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
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__
int tw = 0;
int th = 0;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxWindow* tbar = GetToolBar();
if (tbar)
{
return TRUE;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
BEGIN_EVENT_TABLE(TestRibbon, wxToolBar)
EVT_PAINT(TestRibbon::OnPaint)
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;
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef __WIN95__
#define wxToolBar wxToolBar95
#else
DECLARE_EVENT_TABLE()
};
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
class TestRibbon: public wxToolBar
{
public:
wxTextCtrl *textWindow;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
TestRibbon* toolBar;
#endif
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__
//Microsoft Developer Studio generated resource script.
//
-#ifndef __WINDOWS__
-#define __WINDOWS__
+#ifndef __WXMSW__
+#define __WXMSW__
#endif
#ifndef __WIN32__
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
<<
$(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:
#pragma hdrstop
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <wx/pnghand.h>
#endif
bool MyApp::OnInit(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap::AddHandler(new wxPNGFileHandler);
#endif
frame->CreateStatusBar(2);
// Load icon and bitmap
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("aiai_icn"));
#endif
#ifdef __X__
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)");
void MyFrame::OnPrint(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
void MyFrame::OnPrintPreview(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
void MyFrame::OnPrintSetup(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
wxPrintData data;
data.SetOrientation(orientation);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxPrintDialog printerDialog(this, & data);
#else
wxGenericPrintDialog printerDialog(this, & data);
void MyFrame::OnPageSetup(wxCommandEvent& event)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxGetApp().SetPrintMode(wxPRINT_WINDOWS);
#else
wxGetApp().SetPrintMode(wxPRINT_POSTSCRIPT);
wxPageSetupData data;
data.SetOrientation(orientation);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxPageSetupDialog pageSetupDialog(this, & data);
#else
wxGenericPageSetupDialog pageSetupDialog(this, & data);
// 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'.
// 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");
wxFrame(frame, -1, title, pos, size)
{
// set the icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
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__
frame->SetBackgroundColour(wxColour(255, 255, 255));
// Give it an icon
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
frame->SetIcon(wxIcon("mondrian"));
#endif
#ifdef __X__
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__
#include "wx/gdicmn.h"
#include "wx/cmndata.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifndef __WIN32__
wxPrintData::wxPrintData(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
printData = NULL;
#endif
printOrientation = wxPORTRAIT;
wxPrintData::~wxPrintData(void)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
PRINTDLG *pd = (PRINTDLG *)printData;
if ( pd && pd->hDevMode )
GlobalFree(pd->hDevMode);
#endif
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
void wxPrintData::ConvertToNative(void)
{
PRINTDLG *pd = (PRINTDLG*) printData;
Bracket_None,
Bracket_Normal = ')',
Bracket_Curly = '}',
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Bracket_Windows = '%' // yeah, Windows people are a bit strange ;-)
#endif
};
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
}
else {
// variable doesn't exist => don't change anything
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
if ( bracket != Bracket_Windows )
#endif
if ( bracket != Bracket_None )
wxDate& wxDate::Set()
{
-//#ifdef __WINDOWS__
+//#ifdef __WXMSW__
#if 0
struct _dosdate_t sDate;
_dos_getdate(&sDate);
void wxDataStream::WriteLine(const wxString& line)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxString tmp_string = line + "\r\n";
#else
wxString tmp_string = line + '\n';
#include "wx/generic/printps.h"
/*
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/mdi.h"
#endif
*/
// 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)
{
// TODO: trouble about this is that it pulls in the postscript
// code unecessarily
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
{
wxWindowsPrinter printer;
wxPrintData data;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ( wxTheApp->GetPrintMode() == wxPRINT_WINDOWS )
{
wxPrintDialog printerDialog(parentWin, & data);
{
// 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
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;
#endif
// standard
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <io.h>
#elif (defined(__UNIX__) || defined(__GNUWIN32__))
#include <unistd.h>
#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
#include <dirent.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifndef __GNUWIN32__
#include <direct.h>
#include <dos.h>
#include <dir.h>
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
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
" :;";
{
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
if (ch != '\\' && ch != '/')
strcat (wxBuffer, "/");
strcat (wxBuffer, filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Unix2DosFilename (wxBuffer);
#endif
if (wxFileExists (wxBuffer))
lastCh = buf[len-1];
if (lastCh != '/' && lastCh != '\\')
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
strcat(buf, "\\");
#else
strcat(buf, "/");
#ifdef __VMS__
|| (filename[0] == '[' && filename[1] != '.')
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
/* MSDOS */
|| filename[0] == '\\' || (isalpha (filename[0]) && filename[1] == ':')
#endif
// Destructive removal of /./ and /../ stuff
char *wxRealPath (char *path)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
static const char SEP = '\\';
Unix2DosFilename(path);
#else
path[0] = SEP;
path[1] = '\0';
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
/* Check that path[2] is NULL! */
else if (path[1] == ':' && !path[2])
{
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
trimchars[2] = '\t';
trimchars[3] = 0;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
const char SEP = '\\';
#else
const char SEP = '/';
s = nm;
d = lnm;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
q = FALSE;
#else
q = nm[0] == '\\' && nm[1] == '~';
/* Expand inline environment variables */
while ((*d++ = *s)) {
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
if (*s == '\\') {
if ((*(d - 1) = *++s)) {
s++;
break;
} else
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (*s++ == '$' && (*s == '{' || *s == ')'))
#else
if (*s++ == '$')
return NULL;
strcpy (dest, WXSTRINGCAST filename);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
Unix2DosFilename(dest);
#endif
strcpy(wxBuffer, "~");
if (user && *user)
strcat(wxBuffer, user);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// strcat(wxBuffer, "\\");
#else
// strcat(wxBuffer, "/");
#endif
return tcp + 1;
} /* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
return path + 2;
#endif
#endif
return wxString(tcp + 1);
} /* while */
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (isalpha (*path) && *(path + 1) == ':')
return wxString(path + 2);
#endif
else i --;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
{
else i --;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Try Drive specifier
if (isalpha (buf[0]) && buf[1] == ':')
{
{
if (*s == '\\')
*s = '/';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else
*s = wxToLower (*s); // Case INDEPENDENT
#endif
wxUnix2DosFilename (char *s)
{
// Yes, I really mean this to happen under DOS only! JACS
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (s)
while (*s)
{
{
#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);
{
#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
// 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];
return NULL;
}
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifdef __WIN32__
HANDLE wxFileStrucHandle = INVALID_HANDLE_VALUE;
}
#endif
- // __WINDOWS__
+ // __WXMSW__
// Get current working directory.
// If buf is NULL, allocates space using new, else
{
#ifdef __UNIX__
return (chdir(d) == 0);
-#elif defined(__WINDOWS__)
+#elif defined(__WXMSW__)
#ifdef __WIN32__
return (bool)(SetCurrentDirectory(d) != 0);
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
cdef cc;
static cdef table[]={
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
{"AQUAMARINE",112, 219, 147},
{"BLACK",0, 0, 0},
{"BLUE", 0, 0, 255},
{"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},
if (node)
return (wxColour *)node->Data();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else return NULL;
#endif
-#ifdef __GTK__
+#ifdef __WXGTK__
else {
wxColour *col = new wxColour( colour );
else {
XColor xcolour;
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
Display *display = XtDisplay(wxTheApp->topLevel) ;
#endif
#ifdef __XVIEW__
wxTheFontList = new wxFontList;
wxTheBitmapList = new wxBitmapList;
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
#endif
#ifdef __X__
wxFontPool = new XFontPool;
wxFontList::~wxFontList ()
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxNode *node = First ();
while (node)
{
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 &&
{
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)
{
char *s = va_arg (ap, char *);
// if (s == NULL)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if ((int) s == 0)
#else
if ((long) s == 0)
#include <stdlib.h>
#include <time.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#else //Unix
#include <signal.h>
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
+#ifndef __WXGTK__
: wxLogStream(new ostream(pTextCtrl))
#endif //GTK
{
wxLogTextCtrl::~wxLogTextCtrl()
{
- #ifndef __GTK__
+ #ifndef __WXGTK__
delete m_ostr;
#endif //GTK
}
// 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
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
// get error code from syste
unsigned long wxSysErrorCode()
{
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
#ifdef __WIN32__
return ::GetLastError();
#else //WIN16
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
#ifdef __WIN32__
static char s_szBuf[LOG_BUFFER_SIZE / 2];
switch ( wxMessageBox(szBuf, _("Debug"),
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
case wxYES:
- #ifdef __WINDOWS__
+ #ifdef __WXMSW__
DebugBreak();
#else // Unix
raise(SIGTRAP);
#include <stdarg.h>
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifdef GetClassInfo
va_start(ap, fmt);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
wxDebugContext::GetStream().flush();
}
else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)buffer) ;
#else
fprintf(stderr, buffer);
va_start(ap, fmt);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wvsprintf(buffer,fmt,ap) ;
#else
vsprintf(buffer,fmt,ap) ;
wxDebugContext::GetStream().flush();
}
else
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)buffer) ;
#else
fprintf(stderr, buffer);
#include <math.h>
#include <stdlib.h>
-#if defined(__WINDOWS__) && !defined(__WIN32__)
+#if defined(__WXMSW__) && !defined(__WIN32__)
#include <print.h>
#endif
#include "wx/dcmemory.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/private.h"
#endif
#include <limits.h>
#include <assert.h>
-#ifdef __GTK__
+#ifdef __WXGTK__
#include "gdk/gdkx.h" // GDK_DISPLAY
#include "gdk/gdkprivate.h" // XImage
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifdef DrawText
#undef DrawText
// 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
m_pstream = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Can only send to file in Windows
wxThePrintSetupData->SetPrinterMode(PS_FILE);
#endif
m_filename = file;
m_pstream = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Can only send to file in Windows
wxThePrintSetupData->SetPrinterMode(PS_FILE);
#endif
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);
wxRemoveFile (wxThePrintSetupData->GetPrinterFile());
wxRenameFile(tmp_file, wxThePrintSetupData->GetPrinterFile());
-#if defined(__X__) || defined(__GTK__)
+#if defined(__X__) || defined(__WXGTK__)
if (m_ok)
{
switch (wxThePrintSetupData->GetPrinterMode()) {
{
long width, height, x, y;
-#if !defined(__X__) && !defined(__GTK__)
+#if !defined(__X__) && !defined(__WXGTK__)
return FALSE;
#endif
*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;
long j, i;
char s[3];
-#ifdef __GTK__
+#ifdef __WXGTK__
d = gdk_display;
cm = ((GdkColormapPrivate*)gdk_colormap_get_system())->xcolormap;
#else
-#ifdef __MOTIF__
+#ifdef __WXMOTIF__
d = source->display;
#else
d = wxGetDisplay();
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);
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);
#include "wx/defs.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define __GOOD_COMPILER__
#endif
#include <stdlib.h>
#include <string.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#include <commdlg.h>
LONG APIENTRY _EXPORT wxAbortProc(HDC hPr, int Code);
#endif
- // End __WINDOWS__
+ // End __WXMSW__
#if !USE_SHARED_LIBRARY
IMPLEMENT_CLASS(wxPrinterBase, wxObject)
SetSize(0, 0, 400, 40);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int fontSize = 9;
#else
int fontSize = 10;
// int w, h;
// controlBar->GetSize(&w, &h);
int h;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
h = 40;
#else
h = 60;
}
break;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
}
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)
{
}
break;
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
case RESOURCE_PLATFORM_WINDOWS:
{
if (!optResource && ((noColours == 0) || (noColours <= thisNoColours)))
{
// *** 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)
{
int wxString::ScanfV(const char *pszFormat, va_list argptr) const
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxMessageBox("ScanfV not implemented");
return 0;
#else
#endif
// For ::UpdateWindow
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#endif
}
AdjustScrollbars();
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
::UpdateWindow ((HWND) GetHWND());
#endif
}
SetScrollPos (wxVERTICAL, y_pos, TRUE);
}
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
UpdateWindow ((HWND) GetHWND());
#endif
}
}
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
// Circumvent wxControl::MSWOnMouseMove which doesn't set the cursor.
void wxToolBarBase::MSWOnMouseMove(int x, int y, const WXUINT flags)
{
// 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;
*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;
#include "../common/glob.inc"
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
}
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#ifndef __GNUWIN32__
#define strcasecmp stricmp
int strncasecmp (const char *, const char *, size_t);
}
#endif
-#endif /* __WINDOWS__ */
+#endif /* __WXMSW__ */
char *
char *txt = new char[len+1];
strncpy(txt, pbase(), len);
txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)txt);
#else
fprintf(stderr, txt);
char *txt = new char[len+1];
strncpy(txt, pbase(), len);
txt[len] = '\0';
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
OutputDebugString((LPCSTR)txt);
#else
fprintf(stderr, txt);
#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
{
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);
// Why isn't this needed for Windows??
// Probably because of the SetValue??
-#ifndef __WINDOWS__
+#ifndef __WXMSW__
HighlightCell(dc);
#endif
dc->DestroyClippingRegion();
currentPos = TRUE;
}
// Gets refreshed anyway in MSW
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (!currentPos)
#endif
{
#if !USE_SHARED_LIBRARY
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
#else
if (!helpFile || !helpHost || helpRunning)
return FALSE;
#endif
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (!helpFile || helpRunning)
return FALSE;
#endif
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")))
wxWindow *winFocus = event.GetCurrentFocus();
// @@@ no FindFocus() in wxGTK
- #ifndef __GTK__
+ #ifndef __WXGTK__
if ( winFocus == NULL )
winFocus = wxWindow::FindFocus();
#endif
genericPrintSetupDialog->Close(TRUE);
}
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
else
{
wxPrintData data;
#include "wx/utils.h"
#include "wx/dcclient.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "windows.h"
#endif
if (do_refresh && !noRefresh) Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
UpdateWindow ((HWND) GetHWND());
#endif
}
SetScrollPos (wxVERTICAL, y_pos, TRUE);
}
Refresh();
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
::UpdateWindow ((HWND) GetHWND());
#endif
}
#include "wx/generic/statusbr.h"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <windows.h>
#ifdef DrawText
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());
#endif
/* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
#undef __UNIX__
#undef __LINUX__
#undef __SGI__
#endif
/* define the system to compile */
-#undef __GTK__
+#undef __WXGTK__
#undef __UNIX__
#undef __LINUX__
#undef __SGI__
# -Wredudant-decs
# Which GUI, -Dwx_xview or -Dwx_motif (don't change this)
-GUI = -D__WINDOWS__
+GUI = -D__WXMSW__
# Optimization
# OPT = -O
!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
CC=sc
RC=rc
-CFLAGS = -o -ml -W -D__WINDOWS__
+CFLAGS = -o -ml -W -D__WXMSW__
LDFLAGS = -ml -W
.$(SRCSUFF).obj:
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
# 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
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
void wxApp::CommonInit()
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBuffer = new char[1500];
#else
wxBuffer = new char[BUFSIZ + 512];
m_appName = "";
argc = 0;
argv = NULL;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
m_printMode = wxPRINT_WINDOWS;
#else
m_printMode = wxPRINT_POSTSCRIPT;
const char *wxFloatToStringStr = "%.2f";
const char *wxDoubleToStringStr = "%.2f";
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
const char *wxUserResourceStr = "TEXT";
#endif
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
#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)
#if USE_HELP
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/msw/helpwin.h"
IMPLEMENT_DYNAMIC_CLASS(wxWinHelpController, wxHelpControllerBase)
#endif
// Generic wxHelp controller
IMPLEMENT_CLASS(wxXLPHelpController, wxHelpControllerBase)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
IMPLEMENT_CLASS(wxXLPHelpClient, wxDDEClient)
IMPLEMENT_CLASS(wxXLPHelpConnection, wxDDEConnection)
#else
#include "wx/tbarsmpl.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include "wx/tbarmsw.h"
IMPLEMENT_DYNAMIC_CLASS(wxToolBarMSW, wxToolBarBase)
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)
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)
#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
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"
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)
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)
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)
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;
#if USE_HELP
#include <time.h>
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#include <wx/msw/private.h>
#endif
-L$(BCCDIR)\lib
-D__WXWIN__
--D__WINDOWS__
+-D__WXMSW__
-DWIN32
$(OPT)
$(DEBUG_FLAGS)
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;
if ( data )
printData = *data;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
printData.SetOwnerWindow(p);
#endif
// 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;
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;
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
!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
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
EditorToolPalette *wxResourceManager::OnCreatePalette(wxFrame *parent)
{
// Load palette bitmaps
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap PaletteMessageBitmap("MESSAGETOOL");
wxBitmap PaletteButtonBitmap("BUTTONTOOL");
wxBitmap PaletteCheckBoxBitmap("CHECKBOXTOOL");
palette->SetMargins(2, 2);
/*
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
if (palette->IsKindOf(CLASSINFO(wxToolBarMSW)))
((wxToolBarMSW *)palette)->SetDefaultSize(22, 22);
#endif
#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
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);
if (!m_bitmapImage)
{
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
m_bitmapImage = new wxBitmap("WXWINBMP", wxBITMAP_TYPE_BMP_RESOURCE);
#endif
#ifdef __X__
}
// 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);
frame->CreateStatusBar(1);
frame->SetAutoLayout(TRUE);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxIcon *icon = new wxIcon("DIALOGEDICON");
frame->SetIcon(icon);
#endif
wxToolBarBase *wxResourceManager::OnCreateToolBar(wxFrame *parent)
{
// Load palette bitmaps
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxBitmap ToolbarLoadBitmap("LOADTOOL");
wxBitmap ToolbarSaveBitmap("SAVETOOL");
wxBitmap ToolbarNewBitmap("NEWTOOL");
toolbar->SetMargins(2, 2);
// toolbar->GetDC()->SetBackground(wxLIGHT_GREY_BRUSH);
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
int width = 24;
int dx = 2;
int gap = 6;
m_editorResourceTree->DeleteAllItems();
long id = m_editorResourceTree->InsertItem(0, "Dialogs"
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
, 1, 2
#endif
);
imageId = 3;
long id = m_editorResourceTree->InsertItem(parent, theString
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
, imageId
#endif
);
class wxResourceEditorProjectTree;
class wxResourceEditorControlList;
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
#define wxHelpController wxWinHelpController
#else
#define wxHelpController wxXLPHelpController;
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
char buf[400];
strcpy(buf, child->GetName());
-#ifdef __WINDOWS__
+#ifdef __WXMSW__
wxDos2UnixFilename(buf);
#endif
#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
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
#include <math.h>
#include <string.h>
-#if defined(__WINDOWS__) && !defined(__GNUWIN32__)
+#if defined(__WXMSW__) && !defined(__GNUWIN32__)
#include <strstrea.h>
#else
#include <strstream.h>
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);
/*
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())
projects / wxWidgets.git / commitdiff
