Removed unused symbol __WXOS2__ (it's either __OS2__ when platform specific
- similar to __UNIX__ - or __WXPM__ when specific to the port - similar to symbols __WXMOTIF__ or __WXGTK__). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -286,7 +286,7 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
|
|||||||
// global data
|
// global data
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifdef __WXOS2__
|
#ifdef __WXPM__
|
||||||
// The MakeProcInstance version of the function wxSubclassedGenericControlProc
|
// The MakeProcInstance version of the function wxSubclassedGenericControlProc
|
||||||
WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
|
WXDLLEXPORT_DATA(extern int) wxGenericControlSubClassProc;
|
||||||
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
|
WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
|
||||||
@@ -297,7 +297,7 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
|
|||||||
// global functions
|
// global functions
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
#ifdef __WXOS2__
|
#ifdef __WXPM__
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
WXDLLEXPORT HINSTANCE wxGetInstance();
|
WXDLLEXPORT HINSTANCE wxGetInstance();
|
||||||
|
@@ -400,10 +400,7 @@
|
|||||||
#elif defined(__OS2__)
|
#elif defined(__OS2__)
|
||||||
|
|
||||||
/* wxOS2 vs. non wxOS2 ports on OS2 platform */
|
/* wxOS2 vs. non wxOS2 ports on OS2 platform */
|
||||||
# ifndef __WXMOTIF__
|
# if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
|
||||||
# ifndef __WXOS2__
|
|
||||||
# define __WXOS2__
|
|
||||||
# endif
|
|
||||||
# ifndef __WXPM__
|
# ifndef __WXPM__
|
||||||
# define __WXPM__
|
# define __WXPM__
|
||||||
# endif
|
# endif
|
||||||
|
Reference in New Issue
Block a user