Try to insure usability of this file in non-PM ports.

Hack to try to reduce flicker by creating controls without WS_VISIBLE
        (define WS_VISIBLE to 0).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 74c0a023d61a032ce4b1ab3855e67899a1cef203..28b1ed31bf036bed243b7e3c39febfa63e4a05bd 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -34,6 +34,9 @@
  typedef SPBCDATA *PSPBCDATA;
 #endif
 
  typedef SPBCDATA *PSPBCDATA;
 #endif
 

+#undef WS_VISIBLE
+#define WS_VISIBLE 0
+

 #include "wx/fontenc.h"
 
 class WXDLLEXPORT wxFont;
 #include "wx/fontenc.h"
 
 class WXDLLEXPORT wxFont;


@@ -120,7 +123,7 @@ WXDLLEXPORT_DATA(extern const wxChar*)  wxCanvasClassNameNR;
 // standard icons from the resources
 // ---------------------------------------------------------------------------
 
 // standard icons from the resources
 // ---------------------------------------------------------------------------
 

-#if wxUSE_GUI
+#ifdef __WXPM__

 
 WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
 
 WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;


@@ -130,7 +133,7 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 

-#endif // wxUSE_GUI
+#endif

 
 // ---------------------------------------------------------------------------
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 
 // ---------------------------------------------------------------------------
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a


@@ -187,7 +190,7 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
 // Scale font to get edit control height
 #define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
 
 // Scale font to get edit control height
 #define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
 

-#if wxUSE_GUI
+#ifdef __WXPM__

 
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages
 
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages


@@ -282,7 +285,7 @@ static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid,
 }
 #define WinSendMsg MySendMsg
 
 }
 #define WinSendMsg MySendMsg
 

-#if wxUSE_GUI
+#ifdef __WXPM__

 
 WXDLLEXPORT void wxDrawBorder( HPS     hPS
                               ,RECTL&  rRect
 
 WXDLLEXPORT void wxDrawBorder( HPS     hPS
                               ,RECTL&  rRect


@@ -370,6 +373,6 @@ WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
 
 WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
 
 
 WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
 

-#endif // wxUSE_GUI
+#endif // __WXPM__

 
 #endif // _WX_PRIVATE_H_
 
 #endif // _WX_PRIVATE_H_