X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..1550d5f80d130fea1c05302e890095b7ad27e085:/include/wx/msw/private.h?ds=sidebyside diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index 89cfd4eaae..c7aebfc709 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// // Name: private.h // Purpose: Private declarations: as this header is only included by -// wxWindows itself, it may contain identifiers which don't start +// wxWidgets itself, it may contain identifiers which don't start // with "wx". // Author: Julian Smart // Modified by: @@ -14,27 +14,13 @@ #ifndef _WX_PRIVATE_H_ #define _WX_PRIVATE_H_ -#ifndef STRICT - #define STRICT 1 -#endif - -#include - - -#if defined (__WXWINCE__) - #include // RGB, COLORREF - #include // Global Namespaces ::GetKeyState, ::GetWindowRect -#endif - +#include "wx/msw/wrapwin.h" #ifdef __WXMICROWIN__ // Extra prototypes and symbols not defined by MicroWindows #include "wx/msw/microwin.h" #endif -// undefine conflicting symbols which were defined in windows.h -#include "wx/msw/winundef.h" - // Include fixes for MSLU: #include "wx/msw/mslu.h" @@ -80,7 +66,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; // define things missing from some compilers' headers // --------------------------------------------------------------------------- -#if defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS +#if defined(__WXWINCE__) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) #ifndef ZeroMemory inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); } #endif @@ -88,9 +74,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; // this defines a CASTWNDPROC macro which casts a pointer to the type of a // window proc -#if defined(__WXWINCE__) - typedef FARPROC WndProcCast; -#elif defined(STRICT) || defined(__GNUC__) +#if defined(STRICT) || defined(__GNUC__) typedef WNDPROC WndProcCast; #else typedef FARPROC WndProcCast; @@ -99,6 +83,8 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; #define CASTWNDPROC (WndProcCast) + + // --------------------------------------------------------------------------- // some stuff for old Windows versions (FIXME: what does it do here??) // --------------------------------------------------------------------------- @@ -259,7 +245,7 @@ inline void wxCopyRECTToRect(const RECT& r, wxRect& rect) extern void HIMETRICToPixel(LONG *x, LONG *y); extern void PixelToHIMETRIC(LONG *x, LONG *y); -// Windows convention of the mask is opposed to the wxWindows one, so we need +// Windows convention of the mask is opposed to the wxWidgets one, so we need // to invert the mask each time we pass one/get one to/from Windows extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0); @@ -305,14 +291,11 @@ inline bool wxIsCtrlDown() inline RECT wxGetWindowRect(HWND hwnd) { RECT rect; -#ifdef __WIN16__ - ::GetWindowRect(hwnd, &rect); -#else // Win32 + if ( !::GetWindowRect(hwnd, &rect) ) { wxLogLastError(_T("GetWindowRect")); } -#endif // Win16/32 return rect; } @@ -320,14 +303,11 @@ inline RECT wxGetWindowRect(HWND hwnd) inline RECT wxGetClientRect(HWND hwnd) { RECT rect; -#ifdef __WIN16__ - ::GetClientRect(hwnd, &rect); -#else // Win32 + if ( !::GetClientRect(hwnd, &rect) ) { wxLogLastError(_T("GetClientRect")); } -#endif // Win16/32 return rect; } @@ -345,7 +325,9 @@ struct WinStruct : public T WinStruct() { ::ZeroMemory(this, sizeof(T)); - cbSize = sizeof(T); + + // explicit qualification is required here for this to be valid C++ + this->cbSize = sizeof(T); } }; @@ -366,6 +348,22 @@ private: DECLARE_NO_COPY_CLASS(ScreenHDC) }; +// the same as ScreenHDC but for window DCs +class WindowHDC +{ +public: + WindowHDC(HWND hwnd) { m_hdc = ::GetDC(m_hwnd = hwnd); } + ~WindowHDC() { ::ReleaseDC(m_hwnd, m_hdc); } + + operator HDC() const { return m_hdc; } + +private: + HWND m_hwnd; + HDC m_hdc; + + DECLARE_NO_COPY_CLASS(WindowHDC) +}; + // the same as ScreenHDC but for memory DCs: creates the HDC compatible with // the given one (screen by default) in ctor and destroys it in dtor class MemoryHDC @@ -410,7 +408,7 @@ class GlobalPtr public: GlobalPtr(HGLOBAL hGlobal) : m_hGlobal(hGlobal) { - m_ptr = ::GlobalLock(hGlobal); + m_ptr = GlobalLock(hGlobal); if ( !m_ptr ) { wxLogLastError(_T("GlobalLock")); @@ -419,7 +417,7 @@ public: ~GlobalPtr() { - if ( !::GlobalUnlock(m_hGlobal) ) + if ( !GlobalUnlock(m_hGlobal) ) { #ifdef __WXDEBUG__ // this might happen simply because the block became unlocked @@ -465,6 +463,9 @@ private: #define GetHaccel() ((HACCEL)GetHACCEL()) #define GetHaccelOf(table) ((HACCEL)((table).GetHACCEL())) +#define GetHbrush() ((HPEN)GetResourceHandle()) +#define GetHbrushOf(brush) ((HPEN)(brush).GetResourceHandle()) + #define GetHmenu() ((HMENU)GetHMenu()) #define GetHmenuOf(menu) ((HMENU)menu->GetHMenu()) @@ -477,6 +478,9 @@ private: #define GetHpalette() ((HPALETTE)GetHPALETTE()) #define GetHpaletteOf(pal) ((HPALETTE)(pal).GetHPALETTE()) +#define GetHpen() ((HPEN)GetResourceHandle()) +#define GetHpenOf(pen) ((HPEN)(pen).GetResourceHandle()) + #define GetHrgn() ((HRGN)GetHRGN()) #define GetHrgnOf(rgn) ((HRGN)(rgn).GetHRGN()) @@ -486,8 +490,6 @@ private: // global data // --------------------------------------------------------------------------- -WXDLLIMPEXP_DATA_BASE(extern wxChar*) wxBuffer; - WXDLLIMPEXP_DATA_BASE(extern HINSTANCE) wxhInstance; // --------------------------------------------------------------------------- @@ -496,10 +498,10 @@ WXDLLIMPEXP_DATA_BASE(extern HINSTANCE) wxhInstance; extern "C" { - WXDLLEXPORT HINSTANCE wxGetInstance(); + WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(); } -WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); +WXDLLIMPEXP_BASE void wxSetInstance(HINSTANCE hInst); #if wxUSE_GUI @@ -507,7 +509,7 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst); extern HCURSOR wxGetCurrentBusyCursor(); // from msw/utils.cpp extern const wxCursor *wxGetGlobalCursor(); // from msw/cursor.cpp -WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font); +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 wxFontEncoding wxGetFontEncFromCharSet(int charset); @@ -554,10 +556,62 @@ WXDLLEXPORT extern wxWindow* wxFindWinFromHandle(WXHWND hWnd); // returns the wxWindow corresponding to the given HWND or NULL. WXDLLEXPORT extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd); - // Get the size of an icon WXDLLEXPORT extern wxSize wxGetHiconSize(HICON hicon); +// Lines are drawn differently for WinCE and regular WIN32 +WXDLLEXPORT void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2); + +// ---------------------------------------------------------------------------- +// 32/64 bit helpers +// ---------------------------------------------------------------------------- + +#ifdef __WIN64__ + +inline void *wxGetWindowProc(HWND hwnd) +{ + return (void *)::GetWindowLongPtr(hwnd, GWLP_WNDPROC); +} + +inline void *wxGetWindowUserData(HWND hwnd) +{ + return (void *)::GetWindowLongPtr(hwnd, GWLP_USERDATA); +} + +inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func) +{ + return (WNDPROC)::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)func); +} + +inline void *wxSetWindowUserData(HWND hwnd, void *data) +{ + return (void *)::SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)data); +} + +#else // __WIN32__ + +inline void *wxGetWindowProc(HWND hwnd) +{ + return (void *)::GetWindowLong(hwnd, GWL_WNDPROC); +} + +inline void *wxGetWindowUserData(HWND hwnd) +{ + return (void *)::GetWindowLong(hwnd, GWL_USERDATA); +} + +inline WNDPROC wxSetWindowProc(HWND hwnd, WNDPROC func) +{ + return (WNDPROC)::SetWindowLong(hwnd, GWL_WNDPROC, (LONG)func); +} + +inline void *wxSetWindowUserData(HWND hwnd, void *data) +{ + return (void *)::SetWindowLong(hwnd, GWL_USERDATA, (LONG)data); +} + +#endif // __WIN64__/__WIN32__ + #endif // wxUSE_GUI #endif