Removed unnecessary code from utilsunx.cpp

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

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index 1f143400409de315294545fad8713ea4310e81e3..c23c71526614730a9528fd161d8162440872d9c9 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -67,15 +67,18 @@ 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

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

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

+#if __BORLANDC__ > 0x530
+       typedef long (__stdcall * WndProcCast)( HWND__*, unsigned int, unsigned int, long) ;
+#else

        typedef int (pascal * WndProcCast) ();
        typedef int (pascal * WndProcCast) ();

+#endif

 #      define CASTWNDPROC (WndProcCast)
 #      define CASTWNDPROC (WndProcCast)

-// #    define CASTWNDPROC

 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)
 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)


@@ -226,6 +229,15 @@ inline void wxRGBToColour(wxColour& c, COLORREF rgb)
     c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 
     c.Set(GetRValue(rgb), GetGValue(rgb), GetBValue(rgb));
 }
 

+// copy Windows RECT to our wxRect
+inline void wxCopyRECTToRect(const RECT& r, wxRect& rect)
+{
+    rect.y = r.top;
+    rect.x = r.left;
+    rect.width = r.right - r.left;
+    rect.height = r.bottom - r.top;
+}
+

 // translations between HIMETRIC units (which OLE likes) and pixels (which are
 // liked by all the others) - implemented in msw/utilsexc.cpp
 extern void HIMETRICToPixel(LONG *x, LONG *y);
 // translations between HIMETRIC units (which OLE likes) and pixels (which are
 // liked by all the others) - implemented in msw/utilsexc.cpp
 extern void HIMETRICToPixel(LONG *x, LONG *y);


@@ -235,6 +247,15 @@ extern void PixelToHIMETRIC(LONG *x, LONG *y);
 // 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);
 
 // 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);
 

+// get (x, y) from DWORD - notice that HI/LOWORD can *not* be used because they
+// will fail on system with multiple monitors where the coords may be negative
+//
+// these macros are standard now (Win98) but some older headers don't have them
+#ifndef GET_X_LPARAM
+    #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
+    #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
+#endif // GET_X_LPARAM
+

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


@@ -337,6 +358,12 @@ inline bool wxStyleHasBorder(long style)
                    wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
 }
 
                    wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
 }
 

+// find the window for HWND which is part of some wxWindow, returns just the
+// corresponding wxWindow for HWND which just is one
+//
+// may return NULL
+extern wxWindow *wxGetWindowFromHWND(WXHWND hwnd);
+

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