Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 6810116050c96bb4a280d0327d41ba73528635b6..77c409132eec9f46a8b63bf252d82c99c7b3e1f3 100644 (file)
--- a/include/wx/os2/private.h
+++ b/include/wx/os2/private.h
@@ -30,7 +30,7 @@
    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
 
  typedef SPBCDATA *PSPBCDATA;
 #endif
 


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