signned/unsigned fix

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index b9e0c1829bac2f96d481bc2e0220730c0147bc19..7dc72333fe43298ae7e8a96cd52c111cd2cb5577 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -14,11 +14,25 @@
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 
 #ifndef _WX_PRIVATE_H_
 #define _WX_PRIVATE_H_
 

+#ifndef STRICT
+    #define STRICT 1
+#endif
+

 #include <windows.h>
 
 #include <windows.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"
 
 // undefine conflicting symbols which were defined in windows.h
 #include "wx/msw/winundef.h"
 

+// Include fixes for MSLU:
+#include "wx/msw/mslu.h"
+
+#include "wx/log.h"
+

 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 


@@ -59,7 +73,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------
 
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------
 

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

 #ifndef ZeroMemory
     inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }
 #endif
 #ifndef ZeroMemory
     inline void ZeroMemory(void *buf, size_t len) { memset(buf, 0, len); }
 #endif


@@ -67,45 +81,14 @@ 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

-#ifdef __GNUWIN32_OLD__
-#  define CASTWNDPROC (long unsigned)
-#else
-#  ifdef __BORLANDC__
-
-#  ifdef __WIN32__
-#if __BORLANDC__ > 0x530
-       typedef long (__stdcall * WndProcCast)( HWND__*, unsigned int, unsigned int, long) ;
+#if defined(STRICT) || defined(__GNUC__)
+    typedef WNDPROC WndProcCast;

 #else
 #else

-       typedef int (pascal * WndProcCast) ();
-#endif
-#      define CASTWNDPROC (WndProcCast)
-#  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__)
-#    ifdef __BORLANDC__
-       typedef int (pascal * WndProcCast) ();
-#      define CASTWNDPROC (WndProcCast)
-#    else
-#      if defined(__VISUALC__) && defined(STRICT)
-#        define CASTWNDPROC (WNDPROC)
-#      else
-         typedef int (PASCAL * WndProcCast) ();
-#        define CASTWNDPROC (WndProcCast)
-#      endif
-#    endif
-#    else
-#      define CASTWNDPROC
-#    endif
-#  endif
+    typedef FARPROC WndProcCast;

 #endif
 
 #endif
 

+#define CASTWNDPROC (WndProcCast)
+

 // ---------------------------------------------------------------------------
 // some stuff for old Windows versions (FIXME: what does it do here??)
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // some stuff for old Windows versions (FIXME: what does it do here??)
 // ---------------------------------------------------------------------------


@@ -182,7 +165,8 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 #define DEFAULT_ITEM_HEIGHT 80
 
 // Scale font to get edit control height
 #define DEFAULT_ITEM_HEIGHT 80
 
 // Scale font to get edit control height

-#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
+//#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
+#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (cy+8)

 
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages
 
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages


@@ -210,12 +194,14 @@ extern LONG APIENTRY _EXPORT
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()
 // ---------------------------------------------------------------------------
 
 // a wrapper macro for ZeroMemory()

-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXMICROWIN__)

 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))
 #else
 #define wxZeroMemory(obj)   memset((void*) & obj, 0, sizeof(obj))
 #endif
 
 #define wxZeroMemory(obj)   ::ZeroMemory(&obj, sizeof(obj))
 #else
 #define wxZeroMemory(obj)   memset((void*) & obj, 0, sizeof(obj))
 #endif
 

+#if wxUSE_GUI
+

 #include <wx/gdicmn.h>
 
 // make conversion from wxColour and COLORREF a bit less painful
 #include <wx/gdicmn.h>
 
 // make conversion from wxColour and COLORREF a bit less painful


@@ -224,11 +210,46 @@ inline COLORREF wxColourToRGB(const wxColour& c)
     return RGB(c.Red(), c.Green(), c.Blue());
 }
 
     return RGB(c.Red(), c.Green(), c.Blue());
 }
 

+inline COLORREF wxColourToPalRGB(const wxColour& c)
+{
+    return PALETTERGB(c.Red(), c.Green(), c.Blue());
+}
+
+inline wxColour wxRGBToColour(COLORREF rgb)
+{
+    return wxColour(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
+}
+

 inline void wxRGBToColour(wxColour& c, COLORREF rgb)
 {
     c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 
 inline void wxRGBToColour(wxColour& c, COLORREF rgb)
 {
     c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 

+// get the standard colour map for some standard colours - see comment in this
+// function to understand why is it needed and when should it be used
+//
+// it returns a wxCOLORMAP (can't use COLORMAP itself here as comctl32.dll
+// might be not included/available) array of size wxSTD_COLOUR_MAX
+//
+// NB: if you change these colours, update wxBITMAP_STD_COLOURS in the
+//     resources as well: it must have the same number of pixels!
+enum wxSTD_COLOUR
+{
+    wxSTD_COL_BTNTEXT,
+    wxSTD_COL_BTNSHADOW,
+    wxSTD_COL_BTNFACE,
+    wxSTD_COL_BTNHIGHLIGHT,
+    wxSTD_COL_MAX,
+};
+
+struct WXDLLEXPORT wxCOLORMAP
+{
+    COLORREF from, to;
+};
+
+// this function is implemented in src/msw/window.cpp
+extern wxCOLORMAP *wxGetStdColourMap();
+

 // copy Windows RECT to our wxRect
 inline void wxCopyRECTToRect(const RECT& r, wxRect& rect)
 {
 // copy Windows RECT to our wxRect
 inline void wxCopyRECTToRect(const RECT& r, wxRect& rect)
 {


@@ -257,16 +278,48 @@ extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
 #endif // GET_X_LPARAM
 
 // get the current state of SHIFT/CTRL keys
 #endif // GET_X_LPARAM
 
 // get the current state of SHIFT/CTRL keys

-extern inline bool wxIsShiftDown()
+inline bool wxIsShiftDown()

 {
     return (::GetKeyState(VK_SHIFT) & 0x100) != 0;
 }
 
 {
     return (::GetKeyState(VK_SHIFT) & 0x100) != 0;
 }
 

-extern inline bool wxIsCtrlDown()
+inline bool wxIsCtrlDown()

 {
     return (::GetKeyState(VK_CONTROL) & 0x100) != 0;
 }
 
 {
     return (::GetKeyState(VK_CONTROL) & 0x100) != 0;
 }
 

+// wrapper around GetWindowRect() and GetClientRect() APIs doing error checking
+// for Win32
+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;
+}
+
+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;
+}
+

 // ---------------------------------------------------------------------------
 // small helper classes
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // small helper classes
 // ---------------------------------------------------------------------------


@@ -276,14 +329,47 @@ extern inline bool wxIsCtrlDown()
 class ScreenHDC
 {
 public:
 class ScreenHDC
 {
 public:

-    ScreenHDC() { m_hdc = GetDC(NULL);    }
-   ~ScreenHDC() { ReleaseDC(NULL, m_hdc); }
-    operator HDC() const { return m_hdc;  }
+    ScreenHDC() { m_hdc = ::GetDC(NULL);    }
+   ~ScreenHDC() { ::ReleaseDC(NULL, m_hdc); }
+
+    operator HDC() const { return m_hdc; }
+
+private:
+    HDC m_hdc;
+};
+
+// the same as ScreenHDC but for memory DCs: creates the HDC in ctor and
+// destroys it in dtor
+class MemoryHDC
+{
+public:
+    MemoryHDC() { m_hdc = ::CreateCompatibleDC(NULL); }
+   ~MemoryHDC() { ::DeleteObject(m_hdc);              }
+
+    operator HDC() const { return m_hdc; }

 
 private:
     HDC m_hdc;
 };
 
 
 private:
     HDC m_hdc;
 };
 

+// a class which selects a GDI object into a DC in its ctor and deselects in
+// dtor
+class SelectInHDC
+{
+public:
+    SelectInHDC(HDC hdc, HGDIOBJ hgdiobj) : m_hdc(hdc)
+        { m_hgdiobj = ::SelectObject(hdc, hgdiobj); }
+
+   ~SelectInHDC() { ::SelectObject(m_hdc, m_hgdiobj); }
+
+   // return true if the object was successfully selected
+   operator bool() const { return m_hgdiobj != 0; }
+
+private:
+   HDC m_hdc;
+   HGDIOBJ m_hgdiobj;
+};
+

 // ---------------------------------------------------------------------------
 // macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
 // returns Foo cast to the Windows type for oruselves, while GetFooOf() takes
 // ---------------------------------------------------------------------------
 // macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
 // returns Foo cast to the Windows type for oruselves, while GetFooOf() takes


@@ -314,15 +400,21 @@ private:
 #define GetHcursor()            ((HCURSOR)GetHCURSOR())
 #define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
 
 #define GetHcursor()            ((HCURSOR)GetHCURSOR())
 #define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
 

+#define GetHfont()              ((HFONT)GetHFONT())
+#define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
+
+#define GetHpalette()           ((HPALETTE)GetHPALETTE())
+#define GetHpaletteOf(pal)      ((HPALETTE)(pal).GetHPALETTE())
+
+#define GetHrgn()               ((HRGN)GetHRGN())
+#define GetHrgnOf(rgn)          ((HRGN)(rgn).GetHRGN())
+
+#endif // wxUSE_GUI
+

 // ---------------------------------------------------------------------------
 // global data
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // 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;
 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
 
 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;


@@ -349,6 +441,7 @@ WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 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 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);

 
 WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
 WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
 
 WXDLLEXPORT void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
 WXDLLEXPORT void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);


@@ -369,11 +462,14 @@ WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd);
 // is, for mainly historical reasons, signed)
 WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd);
 
 // is, for mainly historical reasons, signed)
 WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd);
 

+// check if hWnd's WNDPROC is wndProc. Return true if yes, false if they are different
+extern bool wxCheckWindowWndProc(WXHWND hWnd, WXFARPROC wndProc);
+

 // Does this window style specify any border?
 inline bool wxStyleHasBorder(long style)
 {
 // Does this window style specify any border?
 inline bool wxStyleHasBorder(long style)
 {

-  return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER |
-                   wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
+    return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER |
+                     wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;

 }
 
 // find the window for HWND which is part of some wxWindow, returns just the
 }
 
 // find the window for HWND which is part of some wxWindow, returns just the


@@ -382,6 +478,11 @@ inline bool wxStyleHasBorder(long style)
 // may return NULL
 extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 
 // may return NULL
 extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
 

+
+// Get the size of an icon
+wxSize wxGetHiconSize(HICON hicon);
+
+

 #endif // wxUSE_GUI
 
 #endif
 #endif // wxUSE_GUI
 
 #endif