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

*** empty log message ***

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
1999-07-28 03:38:12 +00:00
parent 2259e00789
commit 1777b9bbf4
84 changed files with 546 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/accel.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/accel.h" #include "wx/qt/accel.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/accel.h" #include "wx/mac/accel.h"
#elif defined(__WXPM__)
#include "wx/os2/accel.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/accel.h" #include "wx/stubs/accel.h"
#endif #endif

2
include/wx/app.h
View File

@@ -246,6 +246,8 @@ protected:
#include "wx/gtk/app.h" #include "wx/gtk/app.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/app.h" #include "wx/mac/app.h"
#elif defined(__WXPM__)
#include "wx/os2/app.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/app.h" #include "wx/stubs/app.h"
#endif #endif

2
include/wx/bitmap.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/bitmap.h" #include "wx/qt/bitmap.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/bitmap.h" #include "wx/mac/bitmap.h"
#elif defined(__WXPM__)
#include "wx/os2/bitmap.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/bitmap.h" #include "wx/stubs/bitmap.h"
#endif #endif

2
include/wx/bmpbuttn.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/bmpbuttn.h" #include "wx/qt/bmpbuttn.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/bmpbuttn.h" #include "wx/mac/bmpbuttn.h"
#elif defined(__WXPM__)
#include "wx/os2/bmpbuttn.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/bmpbuttn.h" #include "wx/stubs/bmpbuttn.h"
#endif #endif

2
include/wx/brush.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/brush.h" #include "wx/qt/brush.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/brush.h" #include "wx/mac/brush.h"
#elif defined(__WXPM__)
#include "wx/os2/brush.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/brush.h" #include "wx/stubs/brush.h"
#endif #endif

2
include/wx/button.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/button.h" #include "wx/qt/button.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/button.h" #include "wx/mac/button.h"
#elif defined(__WXPM__)
#include "wx/os2/button.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/button.h" #include "wx/stubs/button.h"
#endif #endif

2
include/wx/checkbox.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/checkbox.h" #include "wx/qt/checkbox.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/checkbox.h" #include "wx/mac/checkbox.h"
#elif defined(__WXPM__)
#include "wx/os2/checkbox.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/checkbox.h" #include "wx/stubs/checkbox.h"
#endif #endif

2
include/wx/checklst.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/checklst.h" #include "wx/qt/checklst.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/checklst.h" #include "wx/mac/checklst.h"
#elif defined(__WXPM__)
#include "wx/os2/checklst.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/checklst.h" #include "wx/stubs/checklst.h"
#endif #endif

2
include/wx/choice.h
View File

@@ -120,6 +120,8 @@ private:
#include "wx/qt/choice.h" #include "wx/qt/choice.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/choice.h" #include "wx/mac/choice.h"
#elif defined(__WXPM__)
#include "wx/os2/choice.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/choice.h" #include "wx/stubs/choice.h"
#endif #endif

2
include/wx/clipbrd.h
View File

@@ -11,6 +11,8 @@
#include "wx/gtk/clipbrd.h" #include "wx/gtk/clipbrd.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/clipbrd.h" #include "wx/mac/clipbrd.h"
#elif defined(__WXPM__)
#include "wx/os2/clipbrd.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/clipbrd.h" #include "wx/stubs/clipbrd.h"
#endif #endif

4
include/wx/cmndata.h
View File

@@ -21,7 +21,7 @@
#include "wx/colour.h" #include "wx/colour.h"
#include "wx/gdicmn.h" #include "wx/gdicmn.h"
#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
class WXDLLEXPORT wxPrintSetupData; class WXDLLEXPORT wxPrintSetupData;
#endif #endif
@@ -156,7 +156,7 @@ class WXDLLEXPORT wxPrintData: public wxObject
void operator=(const wxPrintData& data); void operator=(const wxPrintData& data);
// For compatibility // For compatibility
#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT #if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
void operator=(const wxPrintSetupData& setupData); void operator=(const wxPrintSetupData& setupData);
#endif #endif

2
include/wx/colordlg.h
View File

@@ -11,6 +11,8 @@
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#elif defined(__WXPM__)
#include "wx/generic/colrdlgg.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/colrdlgg.h" #include "wx/generic/colrdlgg.h"
#endif #endif

2
include/wx/colour.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/colour.h" #include "wx/qt/colour.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/colour.h" #include "wx/mac/colour.h"
#elif defined(__WXPM__)
#include "wx/os2/colour.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/colour.h" #include "wx/stubs/colour.h"
#endif #endif

2
include/wx/combobox.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/combobox.h" #include "wx/qt/combobox.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/combobox.h" #include "wx/mac/combobox.h"
#elif defined(__WXPM__)
#include "wx/os2/combobox.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/combobox.h" #include "wx/stubs/combobox.h"
#endif #endif

2
include/wx/control.h
View File

@@ -62,6 +62,8 @@ protected:
#include "wx/qt/control.h" #include "wx/qt/control.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/control.h" #include "wx/mac/control.h"
#elif defined(__WXPM__)
#include "wx/os2/control.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/control.h" #include "wx/stubs/control.h"
#endif #endif

2
include/wx/cursor.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/cursor.h" #include "wx/qt/cursor.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/cursor.h" #include "wx/mac/cursor.h"
#elif defined(__WXPM__)
#include "wx/os2/cursor.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/cursor.h" #include "wx/stubs/cursor.h"
#endif #endif

2
include/wx/dataobj.h
View File

@@ -22,6 +22,8 @@
#include "wx/qt/dnd.h" #include "wx/qt/dnd.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dnd.h" #include "wx/mac/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dnd.h" #include "wx/stubs/dnd.h"
#endif #endif

2
include/wx/dc.h
View File

@@ -548,6 +548,8 @@ private:
#include "wx/qt/dc.h" #include "wx/qt/dc.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dc.h" #include "wx/mac/dc.h"
#elif defined(__WXPM__)
#include "wx/os2/dc.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dc.h" #include "wx/stubs/dc.h"
#endif #endif

2
include/wx/dcclient.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/dcclient.h" #include "wx/qt/dcclient.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dcclient.h" #include "wx/mac/dcclient.h"
#elif defined(__WXPM__)
#include "wx/os2/dcclient.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dcclient.h" #include "wx/stubs/dcclient.h"
#endif #endif

2
include/wx/dcmemory.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/dcmemory.h" #include "wx/qt/dcmemory.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dcmemory.h" #include "wx/mac/dcmemory.h"
#elif defined(__WXPM__)
#include "wx/os2/dcmemory.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dcmemory.h" #include "wx/stubs/dcmemory.h"
#endif #endif

3
include/wx/dcprint.h
View File

@@ -4,6 +4,9 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/dcprint.h" #include "wx/msw/dcprint.h"
#endif #endif
#if defined(__WXPM__)
#include "wx/os2/dcprint.h"
#endif
#endif #endif
// _WX_DCPRINT_H_BASE_ // _WX_DCPRINT_H_BASE_

2
include/wx/dcscreen.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/dcscreen.h" #include "wx/qt/dcscreen.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dcscreen.h" #include "wx/mac/dcscreen.h"
#elif defined(__WXPM__)
#include "wx/os2/dcscreen.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dcscreen.h" #include "wx/stubs/dcscreen.h"
#endif #endif

2
include/wx/dde.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/dde.h" #include "wx/qt/dde.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dde.h" #include "wx/mac/dde.h"
#elif defined(__WXPM__)
#include "wx/os2/dde.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dde.h" #include "wx/stubs/dde.h"
#endif #endif

38
include/wx/defs.h
View File

@@ -68,6 +68,17 @@
#elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) ) #elif defined(applec) || defined(THINK_C) || ( defined( __MWERKS__ ) && !defined(__INTEL__) )
// MacOS // MacOS
#elif defined(__OS2__)
#if defined(__IBMCPP__)
#define __VISAGEAVER__ __IBMCPP__
#endif
#ifndef __WXOS2__
#define __WXOS2__
#endif
#ifndef __WXPM__
#define __WXPM__
#endif
// Place other OS/2 compiler environment defines here
#else // Windows #else // Windows
#ifndef __WINDOWS__ #ifndef __WINDOWS__
#define __WINDOWS__ #define __WINDOWS__
@@ -175,9 +186,9 @@
// Make sure the environment is set correctly // Make sure the environment is set correctly
#if defined(__WXMSW__) && defined(__X__) #if defined(__WXMSW__) && defined(__X__)
#error "Target can't be both X and Windows" #error "Target can't be both X and Windows"
#elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && \ #elif !defined(__WXMOTIF__) && !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXPM__) && \
!defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__) !defined(__WXMAC__) && !defined(__X__) && !defined(__WXQT__) && !defined(__WXSTUBS__)
#error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXSTUBS__]" #error "No Target! Use -D[__WXMOTIF__|__WXGTK__|__WXMSW__|__WXMAC__|__WXQT__|__WXPM__|__WXSTUBS__]"
#endif #endif
// ============================================================================ // ============================================================================
@@ -188,7 +199,7 @@
// check for native bool type and TRUE/FALSE constants // check for native bool type and TRUE/FALSE constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXSTUBS__) #if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXQT__) || defined(__WXPM__) || defined(__WXSTUBS__)
// Bool is now obsolete, use bool instead // Bool is now obsolete, use bool instead
// typedef int Bool; // typedef int Bool;
@@ -233,6 +244,9 @@
#elif defined(__GNUWIN32__) #elif defined(__GNUWIN32__)
// Cygwin supports bool // Cygwin supports bool
#define HAVE_BOOL #define HAVE_BOOL
#elif defined(__VISAGECPP__)
typedef unsigned long bool;
#define HAVE_BOOL
#endif // compilers #endif // compilers
#endif // HAVE_BOOL #endif // HAVE_BOOL
@@ -263,7 +277,7 @@ typedef int wxWindowID;
* Making or using wxWindows as a Windows DLL * Making or using wxWindows as a Windows DLL
*/ */
#ifdef __WXMSW__ #if defined(__WXMSW__)
// _declspec works in BC++ 5 and later, as well as VC++ // _declspec works in BC++ 5 and later, as well as VC++
#if defined(__VISUALC__) || defined(__BORLANDC__) #if defined(__VISUALC__) || defined(__BORLANDC__)
@@ -282,6 +296,22 @@ typedef int wxWindowID;
# define WXDLLEXPORT_CTORFN # define WXDLLEXPORT_CTORFN
# endif # endif
#elif defined(__WXPM__)
# ifdef WXMAKINGDLL
# define WXDLLEXPORT _Export
# define WXDLLEXPORT_DATA(type) _Export type
# define WXDLLEXPORT_CTORFN
# elif defined(WXUSINGDLL)
# define WXDLLEXPORT _Export
# define WXDLLEXPORT_DATA(type) _Export type
# define WXDLLEXPORT_CTORFN
# else
# define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type
# define WXDLLEXPORT_CTORFN
# endif
#else #else
# define WXDLLEXPORT # define WXDLLEXPORT
# define WXDLLEXPORT_DATA(type) type # define WXDLLEXPORT_DATA(type) type

2
include/wx/dialog.h
View File

@@ -75,6 +75,8 @@ protected:
#include "wx/qt/dialog.h" #include "wx/qt/dialog.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dialog.h" #include "wx/mac/dialog.h"
#elif defined(__WXPM__)
#include "wx/os2/dialog.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dialog.h" #include "wx/stubs/dialog.h"
#endif #endif

2
include/wx/dirdlg.h
View File

@@ -15,6 +15,8 @@
#include "wx/qt/dirdlg.h" #include "wx/qt/dirdlg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dirdlg.h" #include "wx/mac/dirdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/dirdlg.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dirdlg.h" #include "wx/stubs/dirdlg.h"
#endif #endif

2
include/wx/dnd.h
View File

@@ -13,6 +13,8 @@
#include "wx/qt/dnd.h" #include "wx/qt/dnd.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/dnd.h" #include "wx/mac/dnd.h"
#elif defined(__WXPM__)
#include "wx/os2/dnd.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/dnd.h" #include "wx/stubs/dnd.h"
#endif #endif

2
include/wx/dragimag.h
View File

@@ -15,6 +15,8 @@
#include "wx/generic/dragimag.h" #include "wx/generic/dragimag.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/generic/dragimag.h" #include "wx/generic/dragimag.h"
#elif defined(__WXPM__)
#include "wx/generic/dragimag.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/dragimag.h" #include "wx/generic/dragimag.h"
#endif #endif

4
include/wx/dynarray.h
View File

@@ -44,8 +44,10 @@
must return negative value, 0 or positive value if pItem1 <, = or > pItem2 must return negative value, 0 or positive value if pItem1 <, = or > pItem2
*/ */
#ifdef __VISUALC__ #if defined(__VISUALC__)
#define CMPFUNC_CONV _cdecl #define CMPFUNC_CONV _cdecl
#elif defined(__VISAGECPP__)
#define CMPFUNC_CONV _Optlink
#else // !Visual C++ #else // !Visual C++
#define CMPFUNC_CONV #define CMPFUNC_CONV
#endif // compiler #endif // compiler

4
include/wx/dynlib.h
View File

@@ -42,6 +42,10 @@
#elif defined(__WINDOWS__) #elif defined(__WINDOWS__)
# include <windows.h> # include <windows.h>
typedef HMODULE wxDllType; typedef HMODULE wxDllType;
#elif defined(__OS2__)
# define INCL_DOS
# include <os2.h>
typedef HMODULE wxDllType;
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
typedef CFragConnectionID wxDllType; typedef CFragConnectionID wxDllType;
#else #else

2
include/wx/filedlg.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/filedlg.h" #include "wx/qt/filedlg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/filedlg.h" #include "wx/mac/filedlg.h"
#elif defined(__WXPM__)
#include "wx/os2/filedlg.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/filedlg.h" #include "wx/stubs/filedlg.h"
#endif #endif

4
include/wx/filefn.h
View File

@@ -173,7 +173,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
#ifdef __UNIX__ #ifdef __UNIX__
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX #define wxFILE_SEP_PATH wxFILE_SEP_PATH_UNIX
#define wxPATH_SEP wxPATH_SEP_UNIX #define wxPATH_SEP wxPATH_SEP_UNIX
#else // Windows #else // Windows and OS/2
#define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS #define wxFILE_SEP_PATH wxFILE_SEP_PATH_DOS
#define wxPATH_SEP wxPATH_SEP_DOS #define wxPATH_SEP wxPATH_SEP_DOS
#endif // Unix/Windows #endif // Unix/Windows
@@ -182,7 +182,7 @@ WXDLLEXPORT bool wxRmdir(const wxString& dir, int flags = 0);
// filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE) // filename1.IsSameAs(filename2, wxARE_FILENAMES_CASE_SENSITIVE)
#ifdef __UNIX__ #ifdef __UNIX__
#define wxARE_FILENAMES_CASE_SENSITIVE TRUE #define wxARE_FILENAMES_CASE_SENSITIVE TRUE
#else // Windows #else // Windows and OS/2
#define wxARE_FILENAMES_CASE_SENSITIVE FALSE #define wxARE_FILENAMES_CASE_SENSITIVE FALSE
#endif // Unix/Windows #endif // Unix/Windows

2
include/wx/font.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/font.h" #include "wx/qt/font.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/font.h" #include "wx/mac/font.h"
#elif defined(__WXPM__)
#include "wx/os2/font.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/font.h" #include "wx/stubs/font.h"
#endif #endif

4
include/wx/fontdlg.h
View File

@@ -19,6 +19,10 @@
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog # define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog # define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXPM__)
#include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog
# define sm_classwxFontDialog sm_classwxGenericFontDialog
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/fontdlgg.h" #include "wx/generic/fontdlgg.h"
# define wxFontDialog wxGenericFontDialog # define wxFontDialog wxGenericFontDialog

2
include/wx/frame.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/frame.h" #include "wx/qt/frame.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/frame.h" #include "wx/mac/frame.h"
#elif defined(__WXPM__)
#include "wx/os2/frame.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/frame.h" #include "wx/stubs/frame.h"
#endif #endif

2
include/wx/gauge.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/gauge.h" #include "wx/qt/gauge.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/gauge.h" #include "wx/mac/gauge.h"
#elif defined(__WXPM__)
#include "wx/os2/gauge.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/gauge.h" #include "wx/stubs/gauge.h"
#endif #endif

3
include/wx/gdicmn.h
View File

@@ -131,6 +131,9 @@ enum wxStockCursor
#ifdef __WXMSW__ #ifdef __WXMSW__
// Load from a resource // Load from a resource
#define wxICON(X) wxIcon("" #X "") #define wxICON(X) wxIcon("" #X "")
#elif defined(__WXPM__)
// Load from a resource
#define wxICON(X) wxIcon("" #X "")
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
// Initialize from an included XPM // Initialize from an included XPM
#define wxICON(X) wxIcon( (const char**) X##_xpm ) #define wxICON(X) wxIcon( (const char**) X##_xpm )

2
include/wx/gdiobj.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/gdiobj.h" #include "wx/qt/gdiobj.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/gdiobj.h" #include "wx/mac/gdiobj.h"
#elif defined(__WXPM__)
#include "wx/os2/gdiobj.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/gdiobj.h" #include "wx/stubs/gdiobj.h"
#endif #endif

2
include/wx/icon.h
View File

@@ -17,6 +17,8 @@
#include "wx/qt/icon.h" #include "wx/qt/icon.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/icon.h" #include "wx/mac/icon.h"
#elif defined(__WXPM__)
#include "wx/os2/icon.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/icon.h" #include "wx/stubs/icon.h"
#endif #endif

2
include/wx/imaglist.h
View File

@@ -15,6 +15,8 @@
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#elif defined(__WXPM__)
#include "wx/generic/imaglist.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/imaglist.h" #include "wx/generic/imaglist.h"
#endif #endif

2
include/wx/joystick.h
View File

@@ -9,6 +9,8 @@
#include "wx/gtk/joystick.h" #include "wx/gtk/joystick.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/joystick.h" #include "wx/mac/joystick.h"
#elif defined(__WXPM__)
#include "wx/os2/joystick.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/joystick.h" #include "wx/stubs/joystick.h"
#endif #endif

2
include/wx/listbox.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/listbox.h" #include "wx/qt/listbox.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/listbox.h" #include "wx/mac/listbox.h"
#elif defined(__WXPM__)
#include "wx/os2/listbox.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/listbox.h" #include "wx/stubs/listbox.h"
#endif #endif

2
include/wx/listctrl.h
View File

@@ -15,6 +15,8 @@
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#elif defined(__WXPM__)
#include "wx/generic/listctrl.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/listctrl.h" #include "wx/generic/listctrl.h"
#endif #endif

2
include/wx/mdi.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/mdi.h" #include "wx/qt/mdi.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/mdi.h" #include "wx/mac/mdi.h"
#elif defined(__WXPM__)
#include "wx/os2/mdi.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/mdi.h" #include "wx/stubs/mdi.h"
#endif #endif

2
include/wx/menu.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/menu.h" #include "wx/qt/menu.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/menu.h" #include "wx/mac/menu.h"
#elif defined(__WXPM__)
#include "wx/os2/menu.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/menu.h" #include "wx/stubs/menu.h"
#endif #endif

2
include/wx/menuitem.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/menuitem.h" #include "wx/qt/menuitem.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/menuitem.h" #include "wx/mac/menuitem.h"
#elif defined(__WXPM__)
#include "wx/os2/menuitem.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/menuitem.h" #include "wx/stubs/menuitem.h"
#endif #endif

3
include/wx/metafile.h
View File

@@ -4,6 +4,9 @@
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/metafile.h" #include "wx/msw/metafile.h"
#endif #endif
#if defined(__WXPM__)
#include "wx/os2/metafile.h"
#endif
#endif #endif
// _WX_METAFILE_H_BASE_ // _WX_METAFILE_H_BASE_

2
include/wx/minifram.h
View File

@@ -9,6 +9,8 @@
#include "wx/gtk/minifram.h" #include "wx/gtk/minifram.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/minifram.h" #include "wx/mac/minifram.h"
#elif defined(__WXPM__)
#include "wx/os2/minifram.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/minifram.h" #include "wx/stubs/minifram.h"
#endif #endif

2
include/wx/msgdlg.h
View File

@@ -11,6 +11,8 @@
#include "wx/generic/msgdlgg.h" #include "wx/generic/msgdlgg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/msgdlg.h" #include "wx/mac/msgdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/msgdlg.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/msgdlgg.h" #include "wx/generic/msgdlgg.h"
#endif #endif

2
include/wx/notebook.h
View File

@@ -103,6 +103,8 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
#include "wx/qt/notebook.h" #include "wx/qt/notebook.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/notebook.h" #include "wx/mac/notebook.h"
#elif defined(__WXPM__)
#include "wx/os2/notebook.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/notebook.h" #include "wx/stubs/notebook.h"
#endif #endif

2
include/wx/palette.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/palette.h" #include "wx/qt/palette.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/palette.h" #include "wx/mac/palette.h"
#elif defined(__WXPM__)
#include "wx/os2/palette.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/palette.h" #include "wx/stubs/palette.h"
#endif #endif

2
include/wx/pen.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/pen.h" #include "wx/qt/pen.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/pen.h" #include "wx/mac/pen.h"
#elif defined(__WXPM__)
#include "wx/os2/pen.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/pen.h" #include "wx/stubs/pen.h"
#endif #endif

2
include/wx/pnghand.h
View File

@@ -9,6 +9,8 @@
#include "wx/gtk/pnghand.h" #include "wx/gtk/pnghand.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/pnghand.h" #include "wx/mac/pnghand.h"
#elif defined(__WXPM__)
#include "wx/os2/pnghand.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/pnghand.h" #include "wx/stubs/pnghand.h"
#endif #endif

2
include/wx/printdlg.h
View File

@@ -11,6 +11,8 @@
#include "wx/generic/prntdlgg.h" #include "wx/generic/prntdlgg.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/printdlg.h" #include "wx/mac/printdlg.h"
#elif defined(__WXPM__)
#include "wx/os2/printdlg.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/prntdlgg.h" #include "wx/generic/prntdlgg.h"
#endif #endif

2
include/wx/radiobox.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/radiobox.h" #include "wx/qt/radiobox.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/radiobox.h" #include "wx/mac/radiobox.h"
#elif defined(__WXPM__)
#include "wx/os2/radiobox.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/radiobox.h" #include "wx/stubs/radiobox.h"
#endif #endif

2
include/wx/radiobut.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/radiobut.h" #include "wx/qt/radiobut.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/radiobut.h" #include "wx/mac/radiobut.h"
#elif defined(__WXPM__)
#include "wx/os2/radiobut.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/radiobut.h" #include "wx/stubs/radiobut.h"
#endif #endif

2
include/wx/region.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/region.h" #include "wx/qt/region.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/region.h" #include "wx/mac/region.h"
#elif defined(__WXPM__)
#include "wx/os2/region.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/region.h" #include "wx/stubs/region.h"
#endif #endif

2
include/wx/sckstrm.h
View File

@@ -56,7 +56,7 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
}; };
class WXDLLEXPORT wxSocketStream : public wxSocketInputStream, class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
public wxSocketOutputStream public wxSocketOutputStream
{ {
public: public:
wxSocketStream(wxSocketBase& s); wxSocketStream(wxSocketBase& s);

2
include/wx/scrolbar.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/scrolbar.h" #include "wx/qt/scrolbar.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/scrolbar.h" #include "wx/mac/scrolbar.h"
#elif defined(__WXPM__)
#include "wx/os2/scrolbar.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/scrolbar.h" #include "wx/stubs/scrolbar.h"
#endif #endif

2
include/wx/settings.h
View File

@@ -114,6 +114,8 @@
#include "wx/qt/settings.h" #include "wx/qt/settings.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/settings.h" #include "wx/mac/settings.h"
#elif defined(__WXPM__)
#include "wx/os2/settings.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/settings.h" #include "wx/stubs/settings.h"
#endif #endif

6
include/wx/setup.h
View File

@@ -4,8 +4,8 @@
/* compatibility code, to be removed asap: */ /* compatibility code, to be removed asap: */
#if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) #if !defined(__WXMSW__) && !defined(__WXGTK__) && !defined(__WXMOTIF__) && !defined(__WXQT__) && !defined(__WXSTUBS__) && !defined(__WXMAC__) && !defined(__WXPM__)
# error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXSTUBS__ # error No __WXxxx__ define set! Please define one of __WXGTK__,__WXMSW__,__WXMOTIF__,__WXMAC__,__WXQT__,__WXPM__,__WXSTUBS__
#endif #endif
#if defined(__WXMSW__) #if defined(__WXMSW__)
@@ -16,6 +16,8 @@
#include "wx/qt/setup.h" #include "wx/qt/setup.h"
#elif defined(__WXMOTIF__) #elif defined(__WXMOTIF__)
#include "wx/motif/setup.h" #include "wx/motif/setup.h"
#elif defined(__WXPM__)
#include "wx/os2/setup.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/setup.h" #include "wx/stubs/setup.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)

2
include/wx/slider.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/slider.h" #include "wx/qt/slider.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/slider.h" #include "wx/mac/slider.h"
#elif defined(__WXPM__)
#include "wx/os2/slider.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/slider.h" #include "wx/stubs/slider.h"
#endif #endif

2
include/wx/spinbutt.h
View File

@@ -79,6 +79,8 @@ protected:
#include "wx/qt/spinbutt.h" #include "wx/qt/spinbutt.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/spinbutt.h" #include "wx/mac/spinbutt.h"
#elif defined(__WXPM__)
#include "wx/os2/spinbutt.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/spinbutt.h" #include "wx/stubs/spinbutt.h"
#endif #endif

2
include/wx/statbmp.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/statbmp.h" #include "wx/qt/statbmp.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/statbmp.h" #include "wx/mac/statbmp.h"
#elif defined(__WXPM__)
#include "wx/os2/statbmp.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/statbmp.h" #include "wx/stubs/statbmp.h"
#endif #endif

2
include/wx/statbox.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/statbox.h" #include "wx/qt/statbox.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/statbox.h" #include "wx/mac/statbox.h"
#elif defined(__WXPM__)
#include "wx/os2/statbox.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/statbox.h" #include "wx/stubs/statbox.h"
#endif #endif

2
include/wx/statline.h
View File

@@ -64,6 +64,8 @@ protected:
#include "wx/msw/statline.h" #include "wx/msw/statline.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/statline.h" #include "wx/gtk/statline.h"
#elif defined(__WXPM__)
#include "wx/os2/statline.h"
#else // use generic implementation for all other platforms #else // use generic implementation for all other platforms
#include "wx/generic/statline.h" #include "wx/generic/statline.h"
#endif #endif

2
include/wx/stattext.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/stattext.h" #include "wx/qt/stattext.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/stattext.h" #include "wx/mac/stattext.h"
#elif defined(__WXPM__)
#include "wx/os2/stattext.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/stattext.h" #include "wx/stubs/stattext.h"
#endif #endif

2
include/wx/string.h
View File

@@ -105,6 +105,8 @@ inline int WXDLLEXPORT Stricmp(const char *psz1, const char *psz2)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(__EMX__) #elif defined(__EMX__)
return stricmp(psz1, psz2); return stricmp(psz1, psz2);
#elif defined(__VISAGECPP__)
return stricmp(psz1, psz2);
#elif defined(__UNIX__) || defined(__GNUWIN32__) #elif defined(__UNIX__) || defined(__GNUWIN32__)
return strcasecmp(psz1, psz2); return strcasecmp(psz1, psz2);
#elif defined(__MWERKS__) && !defined(__INTEL__) #elif defined(__MWERKS__) && !defined(__INTEL__)

2
include/wx/tabctrl.h
View File

@@ -8,6 +8,8 @@
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/tabctrl.h" #include "wx/mac/tabctrl.h"
#elif defined(__WXPM__)
#include "wx/os2/tabctrl.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/tabctrl.h" #include "wx/stubs/tabctrl.h"
#endif #endif

2
include/wx/taskbar.h
View File

@@ -9,6 +9,8 @@
#elif defined(__WXQT__) #elif defined(__WXQT__)
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/taskbar.h" #include "wx/mac/taskbar.h"
#elif defined(__WXPM__)
#include "wx/os2/taskbar.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/taskbar.h" #include "wx/stubs/taskbar.h"
#endif #endif

2
include/wx/tbar95.h
View File

@@ -7,6 +7,8 @@
#include "wx/motif/tbar95.h" #include "wx/motif/tbar95.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/tbar95.h" #include "wx/gtk/tbar95.h"
#elif defined(__WXPM__)
#include "wx/os2/tbar95.h"
#endif #endif
#endif #endif

2
include/wx/tbarmsw.h
View File

@@ -7,6 +7,8 @@
#include "wx/motif/tbarmsw.h" #include "wx/motif/tbarmsw.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk/tbarmsw.h" #include "wx/gtk/tbarmsw.h"
#elif defined(__WXPM__)
#include "wx/os2/tbarmsw.h"
#endif #endif
#endif #endif

2
include/wx/textctrl.h
View File

@@ -172,6 +172,8 @@ private:
#include "wx/qt/textctrl.h" #include "wx/qt/textctrl.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/textctrl.h" #include "wx/mac/textctrl.h"
#elif defined(__WXPM__)
#include "wx/os2/textctrl.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/textctrl.h" #include "wx/stubs/textctrl.h"
#endif #endif

4
include/wx/thread.h
View File

@@ -160,7 +160,7 @@ private:
wxCriticalSection(const wxCriticalSection&); wxCriticalSection(const wxCriticalSection&);
wxCriticalSection& operator=(const wxCriticalSection&); wxCriticalSection& operator=(const wxCriticalSection&);
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
wxCriticalSectionInternal *m_critsect; wxCriticalSectionInternal *m_critsect;
#else // !MSW #else // !MSW
wxMutex m_mutex; wxMutex m_mutex;
@@ -372,7 +372,7 @@ public:
// implementation only until the end of file // implementation only until the end of file
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#if wxUSE_THREADS #if wxUSE_THREADS
#ifdef __WXMSW__ #if defined(__WXMSW__) || defined(__WXPM__)
// unlock GUI if there are threads waiting for and lock it back when // unlock GUI if there are threads waiting for and lock it back when
// there are no more of them - should be called periodically by the main // there are no more of them - should be called periodically by the main
// thread // thread

2
include/wx/timer.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/timer.h" #include "wx/qt/timer.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/timer.h" #include "wx/mac/timer.h"
#elif defined(__WXPM__)
#include "wx/os2/timer.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/stubs/timer.h" #include "wx/stubs/timer.h"
#endif #endif

2
include/wx/toolbar.h
View File

@@ -19,6 +19,8 @@
# include "wx/qt/tbarqt.h" # include "wx/qt/tbarqt.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
# include "wx/mac/toolbar.h" # include "wx/mac/toolbar.h"
#elif defined(__WXPM__)
# include "wx/os2/toolbar.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
# include "wx/stubs/toolbar.h" # include "wx/stubs/toolbar.h"
#endif #endif

2
include/wx/tooltip.h
View File

@@ -11,6 +11,8 @@
#include "wx/qt/tooltip.h" #include "wx/qt/tooltip.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/tooltip.h" #include "wx/mac/tooltip.h"
#elif defined(__WXPM__)
#include "wx/os2/tooltip.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
// #include "wx/stubs/tooltip.h" // #include "wx/stubs/tooltip.h"
#endif #endif

2
include/wx/treectrl.h
View File

@@ -26,6 +26,8 @@
#include "wx/qt/treectrl.h" #include "wx/qt/treectrl.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/generic/treectrl.h" #include "wx/generic/treectrl.h"
#elif defined(__WXPM__)
#include "wx/generic/treectrl.h"
#elif defined(__WXSTUBS__) #elif defined(__WXSTUBS__)
#include "wx/generic/treectrl.h" #include "wx/generic/treectrl.h"
#endif #endif

2
include/wx/version.h
View File

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

2
include/wx/wave.h
View File

@@ -7,6 +7,8 @@
#include "wx/gtk/wave.h" #include "wx/gtk/wave.h"
#elif defined(__WXQT__) #elif defined(__WXQT__)
#include "wx/qt/wave.h" #include "wx/qt/wave.h"
#elif defined(__WXPM__)
#include "wx/os2/wave.h"
#endif #endif
#endif #endif

2
include/wx/window.h
View File

@@ -819,6 +819,8 @@ private:
#include "wx/qt/window.h" #include "wx/qt/window.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/window.h" #include "wx/mac/window.h"
#elif defined(__WXPM__)
#include "wx/os2/window.h"
#endif #endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

665
include/wx/wxchar.h
View File

@@ -18,131 +18,131 @@
// only do SBCS or _UNICODE // only do SBCS or _UNICODE
#if defined (_MBCS ) #if defined (_MBCS )
#error "MBCS is not supported by wxChar" # error "MBCS is not supported by wxChar"
#endif #endif
// set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined // set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined
#if defined(_UNICODE) || defined(UNICODE) #if defined(_UNICODE) || defined(UNICODE)
#undef wxUSE_UNICODE # undef wxUSE_UNICODE
#define wxUSE_UNICODE 1 # define wxUSE_UNICODE 1
#else #else
#ifndef wxUSE_UNICODE # ifndef wxUSE_UNICODE
#define wxUSE_UNICODE 0 # define wxUSE_UNICODE 0
#endif # endif
#endif #endif
// and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1... // and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1...
#if wxUSE_UNICODE #if wxUSE_UNICODE
#ifndef _UNICODE # ifndef _UNICODE
#define _UNICODE # define _UNICODE
#endif # endif
#ifndef UNICODE # ifndef UNICODE
#define UNICODE # define UNICODE
#endif # endif
#endif #endif
// Windows (VC++) has broad TCHAR support // Windows (VC++) has broad TCHAR support
#if defined(__VISUALC__) && defined(__WIN32__) #if defined(__VISUALC__) && defined(__WIN32__)
#define HAVE_WCSLEN 1 # define HAVE_WCSLEN 1
#include <tchar.h> # include <tchar.h>
#if wxUSE_UNICODE // temporary - preserve binary compatibility # if wxUSE_UNICODE // temporary - preserve binary compatibility
typedef _TCHAR wxChar; typedef _TCHAR wxChar;
typedef _TSCHAR wxSChar; typedef _TSCHAR wxSChar;
typedef _TUCHAR wxUChar; typedef _TUCHAR wxUChar;
#else # else
#define wxChar char # define wxChar char
#define wxSChar signed char # define wxSChar signed char
#define wxUChar unsigned char # define wxUChar unsigned char
#endif # endif
// wchar_t is available // wchar_t is available
#undef wxUSE_WCHAR_T # undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
// ctype.h functions // ctype.h functions
#define wxIsalnum _istalnum # define wxIsalnum _istalnum
#define wxIsalpha _istalpha # define wxIsalpha _istalpha
#define wxIsctrl _istctrl # define wxIsctrl _istctrl
#define wxIsdigit _istdigit # define wxIsdigit _istdigit
#define wxIsgraph _istgraph # define wxIsgraph _istgraph
#define wxIslower _istlower # define wxIslower _istlower
#define wxIsprint _istprint # define wxIsprint _istprint
#define wxIspunct _istpunct # define wxIspunct _istpunct
#define wxIsspace _istspace # define wxIsspace _istspace
#define wxIsupper _istupper # define wxIsupper _istupper
#define wxIsxdigit _istxdigit # define wxIsxdigit _istxdigit
#define wxTolower _totlower # define wxTolower _totlower
#define wxToupper _totupper # define wxToupper _totupper
// locale.h functons // locale.h functons
#define wxSetlocale _tsetlocale # define wxSetlocale _tsetlocale
// string.h functions // string.h functions
#define wxStrcat _tcscat # define wxStrcat _tcscat
#define wxStrchr _tcschr # define wxStrchr _tcschr
#define wxStrcmp _tcscmp # define wxStrcmp _tcscmp
#define wxStrcoll _tcscoll # define wxStrcoll _tcscoll
#define wxStrcpy _tcscpy # define wxStrcpy _tcscpy
#define wxStrcspn _tcscspn # define wxStrcspn _tcscspn
#define wxStrftime _tcsftime # define wxStrftime _tcsftime
#define wxStricmp _tcsicmp # define wxStricmp _tcsicmp
#define wxStrlen_ _tcslen // used in wxStrlen inline function # define wxStrlen_ _tcslen // used in wxStrlen inline function
#define wxStrncat _tcsncat # define wxStrncat _tcsncat
#define wxStrncmp _tcsncmp # define wxStrncmp _tcsncmp
#define wxStrncpy _tcsncpy # define wxStrncpy _tcsncpy
#define wxStrpbrk _tcspbrk # define wxStrpbrk _tcspbrk
#define wxStrrchr _tcsrchr # define wxStrrchr _tcsrchr
#define wxStrspn _tcsspn # define wxStrspn _tcsspn
#define wxStrstr _tcsstr # define wxStrstr _tcsstr
#define wxStrtod _tcstod # define wxStrtod _tcstod
// is there a _tcstok[_r] ? // is there a _tcstok[_r] ?
#define wxStrtol _tcstol # define wxStrtol _tcstol
#define wxStrtoul _tcstoul # define wxStrtoul _tcstoul
#define wxStrxfrm _tcsxfrm # define wxStrxfrm _tcsxfrm
// stdio.h functions // stdio.h functions
#define wxFgetc _fgettc # define wxFgetc _fgettc
#define wxFgetchar _fgettchar # define wxFgetchar _fgettchar
#define wxFgets _fgetts # define wxFgets _fgetts
#define wxFopen _tfopen # define wxFopen _tfopen
#define wxFputc _fputtc # define wxFputc _fputtc
#define wxFputchar _fputtchar # define wxFputchar _fputtchar
#define wxFprintf _ftprintf # define wxFprintf _ftprintf
#define wxFreopen _tfreopen # define wxFreopen _tfreopen
#define wxFscanf _ftscanf # define wxFscanf _ftscanf
#define wxGetc _gettc # define wxGetc _gettc
#define wxGetchar _gettchar # define wxGetchar _gettchar
#define wxGets _getts # define wxGets _getts
#define wxPerror _tperror # define wxPerror _tperror
#define wxPrintf _tprintf # define wxPrintf _tprintf
#define wxPutc _puttc # define wxPutc _puttc
#define wxPutchar _puttchar # define wxPutchar _puttchar
#define wxPuts _putts # define wxPuts _putts
#define wxRemove _tremove # define wxRemove _tremove
#define wxRename _trename # define wxRename _trename
#define wxScanf _tscanf # define wxScanf _tscanf
#define wxSprintf _stprintf # define wxSprintf _stprintf
#define wxSscanf _stscanf # define wxSscanf _stscanf
#define wxTmpnam _ttmpnam # define wxTmpnam _ttmpnam
#define wxUngetc _tungetc # define wxUngetc _tungetc
#define wxVfprint _vftprintf # define wxVfprint _vftprintf
#define wxVprintf _vtprintf # define wxVprintf _vtprintf
#define wxVsscanf _vstscanf # define wxVsscanf _vstscanf
#define wxVsprintf _vstprintf # define wxVsprintf _vstprintf
// stdlib.h functions // stdlib.h functions
#if !wxUSE_UNICODE # if !wxUSE_UNICODE
#define wxAtof atof # define wxAtof atof
#endif # endif
#define wxAtoi _ttoi # define wxAtoi _ttoi
#define wxAtol _ttol # define wxAtol _ttol
#define wxGetenv _tgetenv # define wxGetenv _tgetenv
#define wxSystem _tsystem # define wxSystem _tsystem
// time.h functions // time.h functions
#define wxAsctime _tasctime # define wxAsctime _tasctime
#define wxCtime _tctime # define wxCtime _tctime
// #elif defined(XXX) // #elif defined(XXX)
// #include XXX-specific files here // #include XXX-specific files here
@@ -156,281 +156,281 @@ typedef _TUCHAR wxUChar;
// maybe Borland C++ 5.02 has, can't check right now // maybe Borland C++ 5.02 has, can't check right now
// but I'll use the Win32 API instead here // but I'll use the Win32 API instead here
#include <tchar.h> # include <tchar.h>
#if wxUSE_UNICODE // temporary - preserve binary compatibility # if wxUSE_UNICODE // temporary - preserve binary compatibility
typedef _TCHAR wxChar; typedef _TCHAR wxChar;
typedef _TSCHAR wxSChar; typedef _TSCHAR wxSChar;
typedef _TUCHAR wxUChar; typedef _TUCHAR wxUChar;
#else # else
#define wxChar char # define wxChar char
#define wxSChar signed char # define wxSChar signed char
#define wxUChar unsigned char # define wxUChar unsigned char
#endif # endif
// wchar_t is available // wchar_t is available
#undef wxUSE_WCHAR_T # undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
#define wxNEED_WX_CTYPE_H # define wxNEED_WX_CTYPE_H
// #define wxStrtok strtok_r // Borland C++ 4.52 doesn't have strtok_r // #define wxStrtok strtok_r // Borland C++ 4.52 doesn't have strtok_r
#define wxNEED_WX_STRING_H # define wxNEED_WX_STRING_H
#define wxNEED_WX_STDIO_H # define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H # define wxNEED_WX_STDLIB_H
#define wxNEED_WX_TIME_H # define wxNEED_WX_TIME_H
#define wxNEED_WCSLEN # define wxNEED_WCSLEN
#else//!TCHAR-aware compilers #else//!TCHAR-aware compilers
// check whether we should include wchar.h or equivalent // check whether we should include wchar.h or equivalent
#if wxUSE_UNICODE # if wxUSE_UNICODE
#undef wxUSE_WCHAR_T # undef wxUSE_WCHAR_T
#define wxUSE_WCHAR_T 1 // wchar_t *must* be available in Unicode mode # define wxUSE_WCHAR_T 1 // wchar_t *must* be available in Unicode mode
#elif !defined(wxUSE_WCHAR_T) # elif !defined(wxUSE_WCHAR_T)
#if defined(__VISUALC__) && (__VISUALC__ < 900) # if defined(__VISUALC__) && (__VISUALC__ < 900)
#define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5 # define wxUSE_WCHAR_T 0 // wchar_t is not available for MSVC++ 1.5
#elif defined(__UNIX__) # elif defined(__UNIX__)
#if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__) # if defined(HAVE_WCSTR_H) || defined(HAVE_WCHAR_H) || defined(__FreeBSD__)
#define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
#else # else
#define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
#endif # endif
#elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h # elif defined(__GNUWIN32__) && !defined(__MINGW32__) // Cygwin (not Mingw32) doesn't have wcslen.h, needed in buffer.h
#define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
#elif defined(__BORLANDC__) // WIN16 BC++ # elif defined(__BORLANDC__) // WIN16 BC++
#define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
#elif defined(__WATCOMC__) # elif defined(__WATCOMC__)
#define wxUSE_WCHAR_T 0 # define wxUSE_WCHAR_T 0
#else # else
// add additional compiler checks if this fails // add additional compiler checks if this fails
#define wxUSE_WCHAR_T 1 # define wxUSE_WCHAR_T 1
#endif # endif
#endif//wxUSE_UNICODE # endif//wxUSE_UNICODE
#if wxUSE_WCHAR_T # if wxUSE_WCHAR_T
#ifdef HAVE_WCSTR_H # ifdef HAVE_WCSTR_H
#include <wcstr.h> # include <wcstr.h>
#else # else
#ifndef __FreeBSD__ # ifndef __FreeBSD__
#include <wchar.h> # include <wchar.h>
#else # else
#include <stdlib.h> # include <stdlib.h>
#define wxNEED_WCSLEN # define wxNEED_WCSLEN
#endif # endif
#endif # endif
#endif # endif
// check whether we are doing Unicode // check whether we are doing Unicode
#if wxUSE_UNICODE # if wxUSE_UNICODE
#include <wctype.h> # include <wctype.h>
// this is probably glibc-specific // this is probably glibc-specific
#if defined(__WCHAR_TYPE__) # if defined(__WCHAR_TYPE__)
typedef __WCHAR_TYPE__ wxChar; typedef __WCHAR_TYPE__ wxChar;
typedef signed __WCHAR_TYPE__ wxSChar; typedef signed __WCHAR_TYPE__ wxSChar;
typedef unsigned __WCHAR_TYPE__ wxUChar; typedef unsigned __WCHAR_TYPE__ wxUChar;
#define _T(x) L##x # define _T(x) L##x
// ctype.h functions (wctype.h) // ctype.h functions (wctype.h)
#define wxIsalnum iswalnum # define wxIsalnum iswalnum
#define wxIsalpha iswalpha # define wxIsalpha iswalpha
#define wxIsctrl iswcntrl # define wxIsctrl iswcntrl
#define wxIsdigit iswdigit # define wxIsdigit iswdigit
#define wxIsgraph iswgraph # define wxIsgraph iswgraph
#define wxIslower iswlower # define wxIslower iswlower
#define wxIsprint iswprint # define wxIsprint iswprint
#define wxIspunct iswpunct # define wxIspunct iswpunct
#define wxIsspace iswspace # define wxIsspace iswspace
#define wxIsupper iswupper # define wxIsupper iswupper
#define wxIsxdigit iswxdigit # define wxIsxdigit iswxdigit
#if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0) # if defined(__GLIBC__) && (__GLIBC__ == 2) && (__GLIBC_MINOR__ == 0)
// /usr/include/wctype.h incorrectly declares translations tables which // /usr/include/wctype.h incorrectly declares translations tables which
// provokes tons of compile-time warnings - try to correct this // provokes tons of compile-time warnings - try to correct this
#define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower) # define wxTolower(wc) towctrans((wc), (wctrans_t)__ctype_tolower)
#define wxToupper(wc) towctrans((wc), (wctrans_t)__ctype_toupper) # define wxToupper(wc) towctrans((wc), (wctrans_t)__ctype_toupper)
#else # else
#define wxTolower towlower # define wxTolower towlower
#define wxToupper towupper # define wxToupper towupper
#endif // gcc/!gcc # endif // gcc/!gcc
// string.h functions (wchar.h) // string.h functions (wchar.h)
#define wxStrcat wcscat # define wxStrcat wcscat
#define wxStrchr wcschr # define wxStrchr wcschr
#define wxStrcmp wcscmp # define wxStrcmp wcscmp
#define wxStrcoll wcscoll # define wxStrcoll wcscoll
#define wxStrcpy wcscpy # define wxStrcpy wcscpy
#define wxStrcspn wcscspn # define wxStrcspn wcscspn
#define wxStrlen_ wcslen // used in wxStrlen inline function # define wxStrlen_ wcslen // used in wxStrlen inline function
#define wxStrncat wcsncat # define wxStrncat wcsncat
#define wxStrncmp wcsncmp # define wxStrncmp wcsncmp
#define wxStrncpy wcsncpy # define wxStrncpy wcsncpy
#define wxStrpbrk wcspbrk # define wxStrpbrk wcspbrk
#define wxStrrchr wcsrchr # define wxStrrchr wcsrchr
#define wxStrspn wcsspn # define wxStrspn wcsspn
#define wxStrstr wcsstr # define wxStrstr wcsstr
#define wxStrtod wcstod # define wxStrtod wcstod
#define wxStrtok wcstok # define wxStrtok wcstok
#define wxStrtol wcstol # define wxStrtol wcstol
#define wxStrtoul wcstoul # define wxStrtoul wcstoul
#define wxStrxfrm wcsxfrm # define wxStrxfrm wcsxfrm
// glibc doesn't have wc equivalents of the other stuff // glibc doesn't have wc equivalents of the other stuff
#define wxNEED_WX_STDIO_H # define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H # define wxNEED_WX_STDLIB_H
#define wxNEED_WX_TIME_H # define wxNEED_WX_TIME_H
#else//!glibc # else//!glibc
#error "Please define your compiler's Unicode conventions in wxChar.h" # error "Please define your compiler's Unicode conventions in wxChar.h"
#endif # endif
#else//!Unicode # else//!Unicode
#include <ctype.h> # include <ctype.h>
#include <string.h> # include <string.h>
#if 0 // temporary - preserve binary compatibilty # if 0 // temporary - preserve binary compatibilty
typedef char wxChar; typedef char wxChar;
typedef signed char wxSChar; typedef signed char wxSChar;
typedef unsigned char wxUChar; typedef unsigned char wxUChar;
#else # else
#define wxChar char # define wxChar char
#define wxSChar signed char # define wxSChar signed char
#define wxUChar unsigned char # define wxUChar unsigned char
#endif # endif
#ifdef __FreeBSD__ # ifdef __FreeBSD__
#undef _T # undef _T
#endif # endif
#define _T(x) x # define _T(x) x
// ctype.h functions // ctype.h functions
#define wxIsalnum isalnum # define wxIsalnum isalnum
#define wxIsalpha isalpha # define wxIsalpha isalpha
#define wxIsctrl isctrl # define wxIsctrl isctrl
#define wxIsdigit isdigit # define wxIsdigit isdigit
#define wxIsgraph isgraph # define wxIsgraph isgraph
#define wxIslower islower # define wxIslower islower
#define wxIsprint isprint # define wxIsprint isprint
#define wxIspunct ispunct # define wxIspunct ispunct
#define wxIsspace isspace # define wxIsspace isspace
#define wxIsupper isupper # define wxIsupper isupper
#define wxIsxdigit isxdigit # define wxIsxdigit isxdigit
#define wxTolower tolower # define wxTolower tolower
#define wxToupper toupper # define wxToupper toupper
// locale.h functons // locale.h functons
#define wxSetlocale setlocale # define wxSetlocale setlocale
// string.h functions // string.h functions
// #define wxStricmp strcasecmp // #define wxStricmp strcasecmp
// wxStricmp is defined below!! // wxStricmp is defined below!!
// #define wxStrtok strtok_r // this needs a configure check // #define wxStrtok strtok_r // this needs a configure check
// leave the rest to defaults below // leave the rest to defaults below
#define wxNEED_WX_STRING_H # define wxNEED_WX_STRING_H
#define wxNEED_WX_STDIO_H # define wxNEED_WX_STDIO_H
#define wxNEED_WX_STDLIB_H # define wxNEED_WX_STDLIB_H
#define wxNEED_WX_TIME_H # define wxNEED_WX_TIME_H
#endif//Unicode # endif//Unicode
#endif//TCHAR-aware compilers #endif//TCHAR-aware compilers
// define wxStricmp for various compilers without Unicode possibilities // define wxStricmp for various compilers without Unicode possibilities
#if !defined(wxStricmp) && !wxUSE_UNICODE #if !defined(wxStricmp) && !wxUSE_UNICODE
#if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__) # if defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__SALFORDC__)
#define wxStricmp stricmp # define wxStricmp stricmp
#elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS) && defined(__INTEL__)) # elif defined(__SC__) || defined(__VISUALC__) || defined(__VISAGECPP__) || (defined(__MWERKS) && defined(__INTEL__))
#define wxStricmp _stricmp # define wxStricmp _stricmp
#elif defined(__UNIX__) || defined(__GNUWIN32__) # elif defined(__UNIX__) || defined(__GNUWIN32__)
#define wxStricmp strcasecmp # define wxStricmp strcasecmp
#elif defined(__MWERKS__) && !defined(__INTEL__) # elif defined(__MWERKS__) && !defined(__INTEL__)
// use wxWindows' implementation // use wxWindows' implementation
#else # else
// if you leave wxStricmp undefined, wxWindows' implementation will be used // if you leave wxStricmp undefined, wxWindows' implementation will be used
#error "Please define string case-insensitive compare for your OS/compiler" # error "Please define string case-insensitive compare for your OS/compiler"
#endif # endif
#endif #endif
// if we need to define for standard headers, and we're not using Unicode, // if we need to define for standard headers, and we're not using Unicode,
// just define to standard C library routines // just define to standard C library routines
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
#ifdef wxNEED_WX_STRING_H # ifdef wxNEED_WX_STRING_H
#define wxStrcat strcat # define wxStrcat strcat
#define wxStrchr strchr # define wxStrchr strchr
#define wxStrcmp strcmp # define wxStrcmp strcmp
#define wxStrcoll strcoll # define wxStrcoll strcoll
#define wxStrcpy strcpy # define wxStrcpy strcpy
#define wxStrcspn strcspn # define wxStrcspn strcspn
#define wxStrdup strdup # define wxStrdup strdup
#define wxStrlen_ strlen // used in wxStrlen inline function # define wxStrlen_ strlen // used in wxStrlen inline function
#define wxStrncat strncat # define wxStrncat strncat
#define wxStrncmp strncmp # define wxStrncmp strncmp
#define wxStrncpy strncpy # define wxStrncpy strncpy
#define wxStrpbrk strpbrk # define wxStrpbrk strpbrk
#define wxStrrchr strrchr # define wxStrrchr strrchr
#define wxStrspn strspn # define wxStrspn strspn
#define wxStrstr strstr # define wxStrstr strstr
#define wxStrtod strtod # define wxStrtod strtod
#define wxStrtol strtol # define wxStrtol strtol
#define wxStrtoul strtoul # define wxStrtoul strtoul
#define wxStrxfrm strxfrm # define wxStrxfrm strxfrm
#undef wxNEED_WX_STRING_H # undef wxNEED_WX_STRING_H
#endif # endif
#ifdef wxNEED_WX_STDIO_H # ifdef wxNEED_WX_STDIO_H
#define wxFgetc fgetc # define wxFgetc fgetc
#define wxFgetchar fgetchar # define wxFgetchar fgetchar
#define wxFgets fgets # define wxFgets fgets
#define wxFopen fopen # define wxFopen fopen
#define wxFputc fputc # define wxFputc fputc
#define wxFputchar fputchar # define wxFputchar fputchar
#define wxFprintf fprintf # define wxFprintf fprintf
#define wxFreopen freopen # define wxFreopen freopen
#define wxFscanf fscanf # define wxFscanf fscanf
#define wxGetc getc # define wxGetc getc
#define wxGetchar getchar # define wxGetchar getchar
#define wxGets gets # define wxGets gets
#define wxPerror perror # define wxPerror perror
#define wxPrintf printf # define wxPrintf printf
#define wxPutc putc # define wxPutc putc
#define wxPutchar putchar # define wxPutchar putchar
#define wxPuts puts # define wxPuts puts
#define wxRemove remove # define wxRemove remove
#define wxRename rename # define wxRename rename
#define wxScanf scanf # define wxScanf scanf
#define wxSprintf sprintf # define wxSprintf sprintf
#define wxSscanf sscanf # define wxSscanf sscanf
#define wxTmpnam tmpnam # define wxTmpnam tmpnam
#define wxUngetc ungetc # define wxUngetc ungetc
#define wxVfprint vfprintf # define wxVfprint vfprintf
#define wxVprintf vprintf # define wxVprintf vprintf
#define wxVsscanf vsscanf # define wxVsscanf vsscanf
#define wxVsprintf vsprintf # define wxVsprintf vsprintf
#undef wxNEED_WX_STDIO_H # undef wxNEED_WX_STDIO_H
#endif # endif
#ifdef wxNEED_WX_STDLIB_H # ifdef wxNEED_WX_STDLIB_H
#define wxAtof atof # define wxAtof atof
#define wxAtoi atoi # define wxAtoi atoi
#define wxAtol atol # define wxAtol atol
#define wxGetenv getenv # define wxGetenv getenv
#define wxSystem system # define wxSystem system
#undef wxNEED_WX_STDLIB_H # undef wxNEED_WX_STDLIB_H
#endif # endif
#ifdef wxNEED_WX_TIME_H # ifdef wxNEED_WX_TIME_H
#define wxAsctime asctime # define wxAsctime asctime
#define wxCtime ctime # define wxCtime ctime
#define wxStrftime strftime # define wxStrftime strftime
#undef wxNEED_WX_TIME_H # undef wxNEED_WX_TIME_H
#endif # endif
#endif //!Unicode #endif //!Unicode
#if defined(wxNEED_WCSLEN) && wxUSE_UNICODE #if defined(wxNEED_WCSLEN) && wxUSE_UNICODE
#define wcslen wxStrlen # define wcslen wxStrlen
#undef wxNEED_WCSLEN # undef wxNEED_WCSLEN
#endif #endif
/// checks whether the passed in pointer is NULL and if the string is empty /// checks whether the passed in pointer is NULL and if the string is empty
@@ -446,25 +446,25 @@ WXDLLEXPORT inline size_t wxStrlen(const wxChar *psz)
// multibyte<->widechar conversion // multibyte<->widechar conversion
WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n); WXDLLEXPORT size_t wxMB2WC(wchar_t *buf, const char *psz, size_t n);
WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n); WXDLLEXPORT size_t wxWC2MB(char *buf, const wchar_t *psz, size_t n);
#if wxUSE_UNICODE # if wxUSE_UNICODE
#define wxMB2WX wxMB2WC # define wxMB2WX wxMB2WC
#define wxWX2MB wxWC2MB # define wxWX2MB wxWC2MB
#define wxWC2WX wxStrncpy # define wxWC2WX wxStrncpy
#define wxWX2WC wxStrncpy # define wxWX2WC wxStrncpy
#else # else
#define wxMB2WX wxStrncpy # define wxMB2WX wxStrncpy
#define wxWX2MB wxStrncpy # define wxWX2MB wxStrncpy
#define wxWC2WX wxWC2MB # define wxWC2WX wxWC2MB
#define wxWX2WC wxMB2WC # define wxWX2WC wxMB2WC
#endif # endif
#else #else
// No wxUSE_WCHAR_T: we have to do something (JACS) // No wxUSE_WCHAR_T: we have to do something (JACS)
#define wxMB2WC wxStrncpy # define wxMB2WC wxStrncpy
#define wxWC2MB wxStrncpy # define wxWC2MB wxStrncpy
#define wxMB2WX wxStrncpy # define wxMB2WX wxStrncpy
#define wxWX2MB wxStrncpy # define wxWX2MB wxStrncpy
#define wxWC2WX wxWC2MB # define wxWC2WX wxWC2MB
#define wxWX2WC wxMB2WC # define wxWX2WC wxMB2WC
#endif #endif
WXDLLEXPORT bool wxOKlibc(); // for internal use WXDLLEXPORT bool wxOKlibc(); // for internal use
@@ -528,8 +528,8 @@ WXDLLEXPORT size_t wxStrxfrm(wxChar *dest, const wxChar *src, size_t n);
#endif #endif
#ifdef wxNEED_WX_STDIO_H #ifdef wxNEED_WX_STDIO_H
#include <stdio.h> # include <stdio.h>
#include <stdarg.h> # include <stdarg.h>
WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode); WXDLLEXPORT FILE * wxFopen(const wxChar *path, const wxChar *mode);
WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream); WXDLLEXPORT FILE * wxFreopen(const wxChar *path, const wxChar *mode, FILE *stream);
WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...); WXDLLEXPORT int wxPrintf(const wxChar *fmt, ...);
@@ -559,3 +559,4 @@ WXDLLEXPORT size_t wxStrftime(wxChar *s, size_t max, const wxChar *fmt, const
#endif #endif
//_WX_WXCHAR_H_ //_WX_WXCHAR_H_

7
include/wx/wxprec.h
View File

@@ -13,7 +13,7 @@
#include "wx/defs.h" // compiler definitions #include "wx/defs.h" // compiler definitions
// check if to use precompiled headers // check if to use precompiled headers
#if (defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__) #if ((defined(__BORLANDC__) || defined(__VISUALC__) || defined(__WATCOMC__)) && defined(__WXMSW__)) || defined(__WXPM__)
#if !defined(NOPCH) #if !defined(NOPCH)
#define WX_PRECOMP #define WX_PRECOMP
#endif #endif
@@ -32,6 +32,11 @@
#include "wx/msw/winundef.h" #include "wx/msw/winundef.h"
#endif #endif
#ifdef __WXPM__
#define INCL_OS2
#include <os2.h>
#endif
#include "wx/wx.h" #include "wx/wx.h"

7
include/wx/xpmhand.h
View File

@@ -1,11 +1,14 @@
#ifndef _WX_XPMHAND_H_BASE_ #ifndef _WX_XPMHAND_H_BASE_
#define _WX_XPMHAND_H_BASE_ #define _WX_XPMHAND_H_BASE_
// Only wxMSW currently defines a separate XPM handler, since // Only wxMSW and wxPM currently defines a separate XPM handler, since
// mostly Windows apps won't need XPMs. // mostly Windows and Presentation Manager apps won't need XPMs.
#if defined(__WXMSW__) #if defined(__WXMSW__)
#include "wx/msw/xpmhand.h" #include "wx/msw/xpmhand.h"
#endif #endif
#if defined(__WXPM__)
#include "wx/os2/xpmhand.h"
#endif
#endif #endif
// _WX_XPMHAND_H_BASE_ // _WX_XPMHAND_H_BASE_