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 981189b3ffe551646d0828ecced02bff5ef3ba2b..c23c71526614730a9528fd161d8162440872d9c9 100644 (file)
--- 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
 // ---------------------------------------------------------------------------
 
 // 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;
 WXDLLEXPORT_DATA(extern HICON) wxSTD_FRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxSTD_MDICHILDFRAME_ICON;


@@ -51,6 +53,8 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
 WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 

+#endif // wxUSE_GUI
+

 // ---------------------------------------------------------------------------
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // define things missing from some compilers' headers
 // ---------------------------------------------------------------------------


@@ -63,20 +67,25 @@ 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__

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

 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)
 #  endif
 
 #  else
 #  else
        typedef int (pascal * WndProcCast) ();
 #      define CASTWNDPROC (WndProcCast)
 #  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__)
        typedef long (_stdcall * WndProcCast) (HWND, unsigned int, unsigned int, long);
 #      define CASTWNDPROC (WndProcCast)
 #    elif defined(__WIN16__)


@@ -169,7 +178,7 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 // ---------------------------------------------------------------------------
 
 #define MEANING_CHARACTER '0'
 // ---------------------------------------------------------------------------
 
 #define MEANING_CHARACTER '0'

-#define DEFAULT_ITEM_WIDTH  200
+#define DEFAULT_ITEM_WIDTH  100

 #define DEFAULT_ITEM_HEIGHT 80
 
 // Scale font to get edit control height
 #define DEFAULT_ITEM_HEIGHT 80
 
 // Scale font to get edit control height


@@ -220,6 +229,33 @@ 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);
+extern void PixelToHIMETRIC(LONG *x, LONG *y);
+
+// Windows convention of the mask is opposed to the wxWindows 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);
+
+// 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
 // ---------------------------------------------------------------------------


@@ -268,9 +304,13 @@ private:
 // global data
 // ---------------------------------------------------------------------------
 
 // global data
 // ---------------------------------------------------------------------------
 

+#if 0 // where is this??

 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc;
 // The MakeProcInstance version of the function wxSubclassedGenericControlProc
 WXDLLEXPORT_DATA(extern FARPROC) wxGenericControlSubClassProc;

+#endif // 0
+

 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;
 WXDLLEXPORT_DATA(extern wxChar*) wxBuffer;

+

 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 
 // ---------------------------------------------------------------------------
 WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 
 // ---------------------------------------------------------------------------


@@ -279,11 +319,13 @@ WXDLLEXPORT_DATA(extern HINSTANCE) wxhInstance;
 
 extern "C"
 {
 
 extern "C"
 {

-WXDLLEXPORT HINSTANCE wxGetInstance();
+    WXDLLEXPORT HINSTANCE wxGetInstance();

 }
 
 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 
 }
 
 WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 

+#if wxUSE_GUI
+

 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font);
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void wxGetCharSize(WXHWND wnd, int *x, int *y, const wxFont *the_font);


@@ -316,5 +358,13 @@ 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
     // _WX_PRIVATE_H_
 #endif
     // _WX_PRIVATE_H_