added selecting-while-dragging

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 6810116050c96bb4a280d0327d41ba73528635b6..7b57d7f594df336d0d90d521842dc2a68152dbf5 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -30,15 +30,17 @@
    ULONG     idMasterSpb;  /*  ID of the servant's master spinbutton. */
    PVOID     pHWXCtlData;  /*  Handwriting control data structure flag. */
  } SPBCDATA;
    ULONG     idMasterSpb;  /*  ID of the servant's master spinbutton. */
    PVOID     pHWXCtlData;  /*  Handwriting control data structure flag. */
  } SPBCDATA;

- 
+

  typedef SPBCDATA *PSPBCDATA;
 #endif
 
 #include "wx/fontenc.h"
  typedef SPBCDATA *PSPBCDATA;
 #endif
 
 #include "wx/fontenc.h"

+#include "wx/colour.h"

 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxString;
 
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxString;

+class WXDLLEXPORT wxBitmap;

 
 // ---------------------------------------------------------------------------
 // private constants
 
 // ---------------------------------------------------------------------------
 // private constants


@@ -267,9 +269,14 @@ WXDLLEXPORT void wxSetInstance(HINSTANCE hInst);
 WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
 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
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName

-                                 ,HPS           hPS
+                                 ,HPS*          phPS
+                                 ,bool*         pbInternalPS

                                  ,long*         pflId
                                  ,wxString&     sFaceName
                                  ,wxFont*       pFont
                                  ,long*         pflId
                                  ,wxString&     sFaceName
                                  ,wxFont*       pFont


@@ -329,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_