Added NSColor declarataion

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 77c409132eec9f46a8b63bf252d82c99c7b3e1f3..7b57d7f594df336d0d90d521842dc2a68152dbf5 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -35,10 +35,12 @@
 #endif
 
 #include "wx/fontenc.h"
+#include "wx/colour.h"
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxString;
+class WXDLLEXPORT wxBitmap;
 
 // ---------------------------------------------------------------------------
 // private constants
@@ -267,6 +269,10 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
+
+WXDLLEXPORT void   wxConvertVectorFontSize( FIXED   fxPointSize
+                                           ,PFATTRS pFattrs
+                                          );
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName
                                  ,HPS*          phPS
@@ -330,9 +336,13 @@ WXDLLEXPORT extern void wxOS2SetFont( HWND          hWnd
                                     );
 
 
-WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND                            hWnd
-                                             ,WXFARPROC                         fnWndProc
+WXDLLEXPORT extern bool wxCheckWindowWndProc( WXHWND    hWnd
+                                             ,WXFARPROC fnWndProc
                                             );
+WXDLLEXPORT extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
+                                            ,long            lColor
+                                           );
+
+WXDLLEXPORT extern COLORREF wxColourToRGB(const wxColour& rColor);
+#endif // _WX_PRIVATE_H_
 
-#endif
-    // _WX_PRIVATE_H_