Split src/os2/utils.cpp in two to support non-monolithic builds.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

build/bakefiles/files.bkl

@@ -316,8 +316,10 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 
 <set var="NET_OS2_SRC" hints="files">
+    src/os2/gsocket.c
 </set>
 <set var="NET_OS2_HDR" hints="files">
+    wx/unix/gsockunx.h
 </set>
 
 <set var="NET_CMN_SRC" hints="files">
@@ -1356,7 +1358,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/gauge.cpp
     src/os2/gdiimage.cpp
     src/os2/gdiobj.cpp
-    src/os2/gsocket.c
     src/os2/gsockpm.c
     src/os2/helpwin.cpp
     src/os2/icon.cpp
@@ -1393,6 +1394,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/os2/toolbar.cpp
     src/os2/tooltip.cpp
     src/os2/toplevel.cpp
+    src/os2/utilsgui.cpp
     src/os2/window.cpp
 </set>
 <set var="OS2_HDR" hints="files">
@@ -1428,7 +1430,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/os2/gauge.h
     wx/os2/gdiimage.h
     wx/os2/gdiobj.h
-    wx/os2/gsockos2.h
     wx/os2/helpwin.h
     wx/os2/icon.h
     wx/os2/iniconf.h

include/wx/defs.h

@@ -2172,7 +2172,7 @@ typedef int             (__stdcall *WXFARPROC)();
 #endif // __WXMSW__
 
 
-#if defined(__WXPM__)
+#if defined(__WXPM__) || defined(__EMX__)
 #ifdef __EMX__
 /* Need a well-known type for WXFARPROC
    below. MPARAM is typedef'ed too late. */
@@ -2205,7 +2205,9 @@ typedef unsigned long   HIMAGELIST;
 typedef unsigned long   HGLOBAL;
 typedef unsigned long   DWORD;
 typedef unsigned short  WORD;
+#endif // WXPM || EMX
 
+#if defined (__WXPM__)
 // WIN32 graphics types for OS/2 GPI
 
 // RGB under OS2 is more like a PALETTEENTRY struct under Windows so we need a real RGB def

include/wx/os2/private.h

@@ -35,7 +35,6 @@
 #endif
 
 #include "wx/fontenc.h"
-#include "wx/colour.h"
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
@@ -121,6 +120,8 @@ WXDLLEXPORT_DATA(extern const wxChar*)  wxCanvasClassNameNR;
 // 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;
@@ -129,6 +130,8 @@ WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
 WXDLLEXPORT_DATA(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
 WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
 
+#endif // wxUSE_GUI
+
 // ---------------------------------------------------------------------------
 // this defines a CASTWNDPROC macro which casts a pointer to the type of a
 // window proc for PM.
@@ -184,10 +187,14 @@ typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
 // Scale font to get edit control height
 #define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
 
+#if wxUSE_GUI
+
 // Generic subclass proc, for panel item moving/sizing and intercept
 // EDIT control VK_RETURN messages
 extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message, WXWPARAM wParam, WXLPARAM lParam);
 
+#endif
+
 // ---------------------------------------------------------------------------
 // constants which might miss from some compilers' headers
 // ---------------------------------------------------------------------------
@@ -259,13 +266,15 @@ extern "C"
 WXDLLEXPORT HINSTANCE wxGetInstance();
 }
 
+WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
+
+#if wxUSE_GUI
+
 WXDLLEXPORT void wxDrawBorder( HPS     hPS
                               ,RECTL&  rRect
                               ,WXDWORD dwStyle
                              );
 
-WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
-
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
@@ -343,6 +352,10 @@ WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
                                             ,long            lColor
                                            );
 
-WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+#include "wx/colour.h"
-#endif // _WX_PRIVATE_H_
 
+WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+
+#endif // wxUSE_GUI
+
+#endif // _WX_PRIVATE_H_