*** empty log message ***

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 39292f3c980a3aacc77e2e009ea36496b7bf1d4d..02b95773135792ab03e3b0353483a6a33b4bdd1c 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -16,7 +16,28 @@
 
 #include <windows.h>
 
 
 #include <windows.h>
 

+// undefine conflicting symbols which were defined in windows.h
+#include "wx/msw/winundef.h"
+

 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxFont;

+class WXDLLEXPORT wxWindow;
+
+// ---------------------------------------------------------------------------
+// private constants
+// ---------------------------------------------------------------------------
+
+// Conversion
+static const double METRIC_CONVERSION_CONSTANT = 0.0393700787;
+
+// Scaling factors for various unit conversions
+static const double mm2inches = (METRIC_CONVERSION_CONSTANT);
+static const double inches2mm = (1/METRIC_CONVERSION_CONSTANT);
+
+static const double mm2twips = (METRIC_CONVERSION_CONSTANT*1440);
+static const double twips2mm = (1/(METRIC_CONVERSION_CONSTANT*1440));
+
+static const double mm2pt = (METRIC_CONVERSION_CONSTANT*72);
+static const double pt2mm = (1/(METRIC_CONVERSION_CONSTANT*72));

 
 // ---------------------------------------------------------------------------
 // standard icons from the resources
 
 // ---------------------------------------------------------------------------
 // standard icons from the resources


@@ -34,7 +55,8 @@ 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__
+
+#if defined(__GNUWIN32__) && !defined(__MINGW32__)

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


@@ -55,8 +77,12 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)
 #    else
        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
 #    endif
 #    else
 #      define CASTWNDPROC


@@ -83,8 +109,10 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 #endif
 
 #if !defined(__WIN32__)  // 3.x uses FARPROC for dialogs
 #endif
 
 #if !defined(__WIN32__)  // 3.x uses FARPROC for dialogs

+#ifndef STRICT

     #define DLGPROC FARPROC
 #endif
     #define DLGPROC FARPROC
 #endif

+#endif

 
 #if wxUSE_PENWIN
     WXDLLEXPORT void wxRegisterPenWin();
 
 #if wxUSE_PENWIN
     WXDLLEXPORT void wxRegisterPenWin();


@@ -111,17 +139,17 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
  * for this combination of CTl3D/FAFA settings
  */
 
  * for this combination of CTl3D/FAFA settings
  */
 

-#define STATIC_CLASS     "STATIC"
+#define STATIC_CLASS     _T("STATIC")

 #define STATIC_FLAGS     (SS_LEFT|WS_CHILD|WS_VISIBLE)
 #define STATIC_FLAGS     (SS_LEFT|WS_CHILD|WS_VISIBLE)

-#define CHECK_CLASS      "BUTTON"
+#define CHECK_CLASS      _T("BUTTON")

 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
 #define CHECK_IS_FAFA   FALSE
 #define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD)
 #define CHECK_IS_FAFA   FALSE

-#define RADIO_CLASS      "BUTTON"
+#define RADIO_CLASS      _T("BUTTON")

 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA   FALSE
 #define PURE_WINDOWS
 #define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE)
 #define RADIO_SIZE       20
 #define RADIO_IS_FAFA   FALSE
 #define PURE_WINDOWS

-#define GROUP_CLASS      "BUTTON"
+#define GROUP_CLASS      _T("BUTTON")

 #define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)
 
 /*
 #define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)
 
 /*


@@ -178,7 +206,9 @@ extern LONG APIENTRY _EXPORT
 #endif // USE_DBWIN32
 
 // ---------------------------------------------------------------------------
 #endif // USE_DBWIN32
 
 // ---------------------------------------------------------------------------

-// macros to make casting between WXFOO and FOO a bit easier
+// 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?)

 // ---------------------------------------------------------------------------
 
 #define GetHwnd()               ((HWND)GetHWND())
 // ---------------------------------------------------------------------------
 
 #define GetHwnd()               ((HWND)GetHWND())


@@ -186,8 +216,11 @@ extern LONG APIENTRY _EXPORT
 
 #define GetHdc()                ((HDC)GetHDC())
 
 
 #define GetHdc()                ((HDC)GetHDC())
 

+#define GetHicon()              ((HICON)GetHICON())
+#define GetIconHicon(icon)      ((HICON)(icon).GetHICON())
+

 #define GetHaccel()             ((HACCEL)GetHACCEL())
 #define GetHaccel()             ((HACCEL)GetHACCEL())

-#define GetTableHaccel(table)   ((HACCEL)((table)->GetHACCEL()))
+#define GetTableHaccel(table)   ((HACCEL)((table).GetHACCEL()))

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


@@ -226,8 +259,9 @@ WXDLLEXPORT extern wxString wxGetWindowText(WXHWND hWnd);
 // get the window class name
 WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd);
 
 // get the window class name
 WXDLLEXPORT extern wxString wxGetWindowClass(WXHWND hWnd);
 

-// get the window id
-WXDLLEXPORT extern wxWindowID wxGetWindowId(WXHWND hWnd);
+// get the window id (should be unsigned, hence this is not wxWindowID which
+// is, for mainly historical reasons, signed)
+WXDLLEXPORT extern WXWORD wxGetWindowId(WXHWND hWnd);

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