X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d427503c3696486ef84cd0e5081884ccd8d6b434..d352e8509a69f255215d6dff93ffdc7da8dc7e5b:/include/wx/msw/private.h?ds=sidebyside diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index b9decc997c..d43c09dd93 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -43,6 +43,8 @@ static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72)); // standard icons from the resources // --------------------------------------------------------------------------- +#if wxUSE_GUI + WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON; @@ -51,12 +53,21 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON; WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON; WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; +#endif // wxUSE_GUI + // --------------------------------------------------------------------------- -// this defines a CASTWNDPROC macro which casts a pointer to the type of a -// window proc +// define things missing from some compilers' headers // --------------------------------------------------------------------------- -#if defined(__GNUWIN32__) && !defined(__MINGW32__) +#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS) +#ifndef ZeroMemory + inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); } +#endif +#endif // old mingw32 + +// this defines a CASTWNDPROC macro which casts a pointer to the type of a +// window proc +#if defined(__GNUWIN32__) && !defined(wxUSE_NORLANDER_HEADERS) # define CASTWNDPROC (long unsigned) #else # ifdef __BORLANDC__ @@ -69,7 +80,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__) @@ -77,8 +88,12 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; typedef int (pascal * WndProcCast) (); # define CASTWNDPROC (WndProcCast) # else - typedef int (PASCAL * WndProcCast) (); -# define CASTWNDPROC (WndProcCast) +# if defined(__VISUALC__) && defined(STRICT) +# define CASTWNDPROC (WNDPROC) +# else + typedef int (PASCAL * WndProcCast) (); +# define CASTWNDPROC (WndProcCast) +# endif # endif # else # define CASTWNDPROC @@ -105,8 +120,10 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; #endif #if !defined(__WIN32__) // 3.x uses FARPROC for dialogs +#ifndef STRICT #define DLGPROC FARPROC #endif +#endif #if wxUSE_PENWIN WXDLLEXPORT void wxRegisterPenWin(); @@ -133,17 +150,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) /* @@ -184,59 +201,104 @@ extern LONG APIENTRY _EXPORT #endif // --------------------------------------------------------------------------- -// debug messages +// useful macros and functions // --------------------------------------------------------------------------- -#if defined(__WIN95__) && defined(__WXDEBUG__) && wxUSE_DBWIN32 - #ifndef __TWIN32__ - #ifdef OutputDebugString - #undef OutputDebugString - #endif +// a wrapper macro for ZeroMemory() +#ifdef __WIN32__ +#define wxZeroMemory(obj) ::ZeroMemory(&obj, sizeof(obj)) +#else +#define wxZeroMemory(obj) memset((void*) & obj, 0, sizeof(obj)) +#endif - #define OutputDebugString OutputDebugStringW95 - #endif // __TWIN32__ +#include - extern void OutputDebugStringW95(const wxChar*, ...); -#endif // USE_DBWIN32 +// make conversion from wxColour and COLORREF a bit less painful +inline COLORREF wxColourToRGB(const wxColour& c) +{ + return RGB(c.Red(), c.Green(), c.Blue()); +} + +inline void wxRGBToColour(wxColour& c, COLORREF rgb) +{ + c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb)); +} + +// --------------------------------------------------------------------------- +// small helper classes +// --------------------------------------------------------------------------- + +// create an instance of this class and use it as the HDC for screen, will +// automatically release the DC going out of scope +class ScreenHDC +{ +public: + ScreenHDC() { m_hdc = GetDC(NULL); } + ~ScreenHDC() { ReleaseDC(NULL, m_hdc); } + operator HDC() const { return m_hdc; } + +private: + HDC m_hdc; +}; // --------------------------------------------------------------------------- // 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 GetHbitmap() ((HBITMAP)GetHBITMAP()) +#define GetHbitmapOf(bmp) ((HBITMAP)(bmp).GetHBITMAP()) #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 // --------------------------------------------------------------------------- +#if 0 // where is this?? // The MakeProcInstance version of the function wxSubclassedGenericControlProc WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc; +#endif // 0 + WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; + WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance; // --------------------------------------------------------------------------- // global functions // --------------------------------------------------------------------------- -WXDLLEXPORT HINSTANCE wxGetInstance(); +extern "C" +{ + WXDLLEXPORT HINSTANCE wxGetInstance(); +} + WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); +#if wxUSE_GUI + WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd); -WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font); -WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, wxFont *font); -WXDLLEXPORT wxFont wxCreateFontFromLogFont(LOGFONT *logFont); +WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font); +WXDLLEXPORT void wxFillLogFont(LOGFONT *logFont, const wxFont *font); +WXDLLEXPORT wxFont wxCreateFontFromLogFont(const LOGFONT *logFont); WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos); WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos); @@ -264,5 +326,7 @@ inline bool wxStyleHasBorder(long style) wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0; } +#endif // wxUSE_GUI + #endif // _WX_PRIVATE_H_