char handling fixed again

[wxWidgets.git] / include / wx / msw / private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 54d0d96e885fcfc556e8f84a1da9f1f37d6f4b17..d6ba8ae9238d27be202ac838b22dcf46880eb398 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -34,6 +34,7 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 WXDLLEXPORT HINSTANCE wxGetInstance();
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 WXDLLEXPORT HINSTANCE wxGetInstance();

+WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);

 WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font);
 WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 
 WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font);
 WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 


@@ -83,8 +84,8 @@ typedef signed short int SHORT ;
 #endif
 
 #if wxUSE_PENWIN
 #endif
 
 #if wxUSE_PENWIN

-WXDLLEXPORT void wxRegisterPenWin(void);
-WXDLLEXPORT void wxCleanUpPenWin(void);
+WXDLLEXPORT void wxRegisterPenWin();
+WXDLLEXPORT void wxCleanUpPenWin();

 WXDLLEXPORT void wxEnablePenAppHooks (bool hook);
 #endif
 
 WXDLLEXPORT void wxEnablePenAppHooks (bool hook);
 #endif
 


@@ -105,13 +106,13 @@ VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
  * - NULL any extra child window pointers not created for this item
  *   (e.g. label control that wasn't needed)
  * - delete any extra child windows in the destructor (e.g. label control)
  * - NULL any extra child window pointers not created for this item
  *   (e.g. label control that wasn't needed)
  * - delete any extra child windows in the destructor (e.g. label control)

- * - implement GetSize and SetSize
+ * - implement DoSetSize

  * - to find panel position if coordinates are (-1, -1), use GetPosition
  * - call AdvanceCursor after creation, for panel layout mechanism.
  *
  */
 
  * - to find panel position if coordinates are (-1, -1), use GetPosition
  * - call AdvanceCursor after creation, for panel layout mechanism.
  *
  */
 

-#if CTL3D
+#if wxUSE_CTL3D

 #include <wx/msw/ctl3d/ctl3d.h>
 #endif
 
 #include <wx/msw/ctl3d/ctl3d.h>
 #endif
 


@@ -177,12 +178,20 @@ inline bool wxStyleHasBorder(long style)
   #define WS_EX_CLIENTEDGE 0
 #endif
 
   #define WS_EX_CLIENTEDGE 0
 #endif
 

+#if defined(__WIN32__) && !defined(WS_EX_CLIENTEDGE)
+  #define WS_EX_CLIENTEDGE 0x00000200L
+#endif
+

 #if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32
 #if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32

+
+#ifndef __TWIN32__

 #ifdef OutputDebugString
 #undef OutputDebugString
 #endif
 
 #define OutputDebugString OutputDebugStringW95
 #ifdef OutputDebugString
 #undef OutputDebugString
 #endif
 
 #define OutputDebugString OutputDebugStringW95

+#endif
+

 extern void OutputDebugStringW95(const char*, ...);
 #endif
 
 extern void OutputDebugStringW95(const char*, ...);
 #endif