X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/27a9bd487b5ee30238e35ff4962bf70237cfc2c0..e43cab59ed18043a1d01f305bc1cfa77511cd206:/include/wx/msw/private.h?ds=sidebyside diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 02b9577313..f9136f96e3 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -56,7 +56,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; // window proc // --------------------------------------------------------------------------- -#if defined(__GNUWIN32__) && !defined(__MINGW32__) +#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS) # define CASTWNDPROC (long unsigned) #else # ifdef __BORLANDC__ @@ -69,7 +69,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; # endif # else -# if defined (__WIN32__) && defined(STRICT) +# if defined (__WIN32__) && defined(STRICT) typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long); # define CASTWNDPROC (WndProcCast) # elif defined(__WIN16__) @@ -139,17 +139,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; * for this combination of CTl3D/FAFA settings */ -#define STATIC_CLASS _T("STATIC") +#define STATIC_CLASS wxT("STATIC") #define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE) -#define CHECK_CLASS _T("BUTTON") +#define CHECK_CLASS wxT("BUTTON") #define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD) #define CHECK_IS_FAFA FALSE -#define RADIO_CLASS _T("BUTTON") +#define RADIO_CLASS wxT("BUTTON") #define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE) #define RADIO_SIZE 20 #define RADIO_IS_FAFA FALSE #define PURE_WINDOWS -#define GROUP_CLASS _T("BUTTON") +#define GROUP_CLASS wxT("BUTTON") #define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE) /* @@ -207,20 +207,27 @@ extern LONG APIENTRY _EXPORT // --------------------------------------------------------------------------- // macros to make casting between WXFOO and FOO a bit easier: the GetFoo() -// returns Foo cast to the Windows type for oruselves, while GetFoosFoo() takes -// an argument which should be a pointer to wxFoo (is this really clear?) +// returns Foo cast to the Windows type for oruselves, while GetFooOf() takes +// an argument which should be a pointer or reference to the object of the +// corresponding class (this depends on the macro) // --------------------------------------------------------------------------- #define GetHwnd() ((HWND)GetHWND()) -#define GetWinHwnd(win) ((HWND)((win)->GetHWND())) +#define GetHwndOf(win) ((HWND)((win)->GetHWND())) +// old name +#define GetWinHwnd GetHwndOf #define GetHdc() ((HDC)GetHDC()) +#define GetHdcOf(dc) ((HDC)(dc).GetHDC()) #define GetHicon() ((HICON)GetHICON()) -#define GetIconHicon(icon) ((HICON)(icon).GetHICON()) +#define GetHiconOf(icon) ((HICON)(icon).GetHICON()) #define GetHaccel() ((HACCEL)GetHACCEL()) -#define GetTableHaccel(table) ((HACCEL)((table).GetHACCEL())) +#define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL())) + +#define GetHmenu() ((HMENU)GetHMenu()) +#define GetHmenuOf(menu) ((HMENU)menu->GetHMenu()) // --------------------------------------------------------------------------- // global data @@ -235,7 +242,11 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; // global functions // --------------------------------------------------------------------------- +extern "C" +{ WXDLLEXPORT HINSTANCE wxGetInstance(); +} + WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);