OS/2 bug fix updates.

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

diff --git a/include/wx/os2/private.h b/include/wx/os2/private.h
index 6810116050c96bb4a280d0327d41ba73528635b6..dba3339d601995c02eac816b2d1e790f14dd6d2c 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;
- 
+
  typedef SPBCDATA *PSPBCDATA;
 #endif
 
@@ -269,7 +269,7 @@ WXDLLEXPORT wxWindow* wxFindWinFromHandle(WXHWND hWnd);
 WXDLLEXPORT void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
 WXDLLEXPORT void   wxFillLogFont( LOGFONT*      pLogFont
                                  ,PFACENAMEDESC pFaceName
-                                 ,HPS           hPS
+                                 ,HPS*          phPS
                                  ,long*         pflId
                                  ,wxString&     sFaceName
                                  ,wxFont*       pFont

diff --git a/include/wx/os2/textctrl.h b/include/wx/os2/textctrl.h
index ec6eaa5ca1ce09de0e301a46d5246ac3ad7296c6..b9f7a81a44cb4c16e425feaa68e3f1041e89860e 100644 (file)
--- a/include/wx/os2/textctrl.h
+++ b/include/wx/os2/textctrl.h
@@ -169,6 +169,7 @@ protected:
     //
     void           AdjustSpaceLimit(void);
     virtual wxSize DoGetBestSize(void) const;
+    virtual bool   OS2ShouldPreProcessMessage(WXMSG* pMsg);
 
 private:
     bool                            m_bIsMLE;

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index f7188ff8dc6a6fc2989e92f34768257ffaa7df5b..e18f1662cb5f717e8caf6bcb6a3586d15ce1ca44 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -421,6 +421,7 @@ public:
                                      ,WXLPARAM lParam
                                     );
     virtual bool    OS2ProcessMessage(WXMSG* pMsg);
+    virtual bool    OS2ShouldPreProcessMessage(WXMSG* pMsg);
     virtual bool    OS2TranslateMessage(WXMSG* pMsg);
     virtual void    OS2DestroyWindow(void);