minimalistic build fixes (mostly #if wxUSE_something)

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 15d89886ced0d9accc65c85b3d2d0539956e258a..6ed5fcb913878f500591ef07ea02d031327c9bd2 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -67,15 +67,18 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 // window proc
 
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 // window proc

-#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS)
+#ifdef __GNUWIN32_OLD__

 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
 
 #  ifdef __WIN32__
 #  define CASTWNDPROC (long unsigned)
 #else
 #  ifdef __BORLANDC__
 
 #  ifdef __WIN32__

+#if __BORLANDC__ > 0x530
+       typedef long (__stdcall * WndProcCast)( HWND__*, unsigned int, unsigned int, long) ;
+#else

        typedef int (pascal * WndProcCast) ();
        typedef int (pascal * WndProcCast) ();

+#endif

 #      define CASTWNDPROC (WndProcCast)
 #      define CASTWNDPROC (WndProcCast)

-// #    define CASTWNDPROC

 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)
 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)


@@ -297,6 +300,9 @@ private:
 #define GetHmenu()              ((HMENU)GetHMenu())
 #define GetHmenuOf(menu)        ((HMENU)menu->GetHMenu())
 
 #define GetHmenu()              ((HMENU)GetHMenu())
 #define GetHmenuOf(menu)        ((HMENU)menu->GetHMenu())
 

+#define GetHcursor()            ((HCURSOR)GetHCURSOR())
+#define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
+

 // ---------------------------------------------------------------------------
 // global data
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // global data
 // ---------------------------------------------------------------------------


@@ -323,6 +329,10 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI
 

+// cursor stuff
+extern HCURSOR wxGetCurrentBusyCursor();    // from msw/utils.cpp
+extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp
+

 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font);
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font);