wxMenu code clean up

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 8a64ec87962140afa9048c0961cbe4f8a398dcd1..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);
 


@@ -41,14 +42,26 @@ WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); // , bool createNe
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__

+
+#  ifdef __WIN32__

 #    define CASTWNDPROC
 #    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__)
 #  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)
        typedef int (PASCAL * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)

+#    endif

 #    else
 #      define CASTWNDPROC
 #    endif
 #    else
 #      define CASTWNDPROC
 #    endif


@@ -71,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
 


@@ -93,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
 


@@ -165,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