X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a302dcba6d7f6828f221f7341ee8a8cbcd8e96..e97f6ab64ef2e1e3839114d95ad6b60b7ac5bd27:/include/wx/msw/private.h

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index de33833bea..3881c31250 100644
--- 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 void wxSetInstance(HINSTANCE hInst);
 WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font);
 WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNew = TRUE);
 
@@ -41,11 +42,26 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
+
+#  ifdef __WIN32__
 #    define CASTWNDPROC
+#  else
+       typedef int (pascal * WndProcCast) ();
+#      define CASTWNDPROC (WndProcCast)
+#  endif
+
 #  else
 #    if defined (__WIN32__) && defined(STRICT)
        typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
 #      define CASTWNDPROC (WndProcCast)
+#    elif defined(__WIN16__)
+#    ifdef __BORLANDC__
+       typedef int (pascal * WndProcCast) ();
+#      define CASTWNDPROC (WndProcCast)
+#    else
+       typedef int (PASCAL * WndProcCast) ();
+#      define CASTWNDPROC (WndProcCast)
+#    endif
 #    else
 #      define CASTWNDPROC
 #    endif
@@ -68,8 +84,8 @@ typedef signed short int SHORT ;
 #endif
 
 #if wxUSE_PENWIN
-WXDLLEXPORT void wxRegisterPenWin(void);
-WXDLLEXPORT void wxCleanUpPenWin(void);
+WXDLLEXPORT void wxRegisterPenWin();
+WXDLLEXPORT void wxCleanUpPenWin();
 WXDLLEXPORT void wxEnablePenAppHooks (bool hook);
 #endif
 
@@ -90,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)
- * - 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.
  *
  */
 
-#if CTL3D
+#if wxUSE_CTL3D
 #include <wx/msw/ctl3d/ctl3d.h>
 #endif
 
@@ -142,7 +158,7 @@ WXDLLEXPORT extern void wxFindMaxSize(WXHWND hwnd, RECT *rect);
 WXDLLEXPORT_DATA(extern wxList) wxScrollBarList;
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc;
-WXDLLEXPORT_DATA(extern char*) wxBuffer;
+WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 
 WXDLLEXPORT wxWindow* wxFindControlFromHandle(WXHWND hWnd);
@@ -162,12 +178,20 @@ inline bool wxStyleHasBorder(long style)
   #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
+
+#ifndef __TWIN32__
 #ifdef OutputDebugString
 #undef OutputDebugString
 #endif
 
 #define OutputDebugString OutputDebugStringW95
+#endif
+
 extern void OutputDebugStringW95(const char*, ...);
 #endif