Weekly update

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 47a0bcd5041e88b0e8e0814c4e538ec258601510..81d97f47f7de5be7ecfd9b8b65c56b28e34f38fa 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -84,9 +84,9 @@ protected:
     void            SetTmpDefault(void);
     void            UnsetTmpDefault(void);
 
-    static void UpdateDefaultStyle( wxWindow* pWinDefault
-                                   ,wxWindow* pWinOldDefault
-                                  );
+    static void     SetDefaultStyle( wxButton* pButton
+                                    ,bool      bOn
+                                   );
 
     virtual wxSize  DoGetBestSize(void) const;
     virtual WXDWORD OS2GetStyle( long     style

diff --git a/include/wx/os2/frame.h b/include/wx/os2/frame.h
index 5f1c971b076aab59579180aab8ecbe7d519596a9..5e1be0b79273421ba0b2558a4d3f039e97d39f76 100644 (file)
--- a/include/wx/os2/frame.h
+++ b/include/wx/os2/frame.h
@@ -125,6 +125,8 @@ public:
     void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
 #endif // tooltips
 
+    virtual void SendSizeEvent(void);
+
     void      SetClient(WXHWND    c_Hwnd);
     void      SetClient(wxWindow* c_Window);
     wxWindow *GetClient();

diff --git a/include/wx/os2/spinctrl.h b/include/wx/os2/spinctrl.h
index 4c39c123c7160c4f5535c938cacfafc8eb7cd23a..bcda821de6a46ac4ebacd2bbf66b0fefcbe064bb 100644 (file)
--- a/include/wx/os2/spinctrl.h
+++ b/include/wx/os2/spinctrl.h
@@ -72,6 +72,9 @@ public:
            virtual bool SetFont(const wxFont &rFont);
            virtual void SetFocus(void);
     inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); }
+                   void SetSelection( long lFrom
+                                     ,long lTo
+                                    );
 
            virtual bool Show(bool bShow = TRUE);
 

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 04aa11e48d77263c038ed83acd6ca5ede233e2a7..dd4a0e64fe8f70ff2bbfcbfc8b644b988a0c84e8 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -602,20 +602,21 @@ private:
                               ,WXWPARAM    wParam = 0
                              ) const;
 
-
-    DECLARE_DYNAMIC_CLASS(wxWindowOS2);
-    DECLARE_NO_COPY_CLASS(wxWindowOS2)
-    DECLARE_EVENT_TABLE()
-
-private:
+    wxWindowList*                   m_pChildrenDisabled;
     HWND                            m_hWndScrollBarHorz;
     HWND                            m_hWndScrollBarVert;
     SWP                             m_vWinSwp;
     bool                            m_bIsActivePage;
 
+    DECLARE_DYNAMIC_CLASS(wxWindowOS2);
+    DECLARE_NO_COPY_CLASS(wxWindowOS2)
+    DECLARE_EVENT_TABLE()
+
+    //
     // Virtual function hiding supression
+    //
     inline virtual bool Reparent(wxWindowBase* pNewParent)
-    { return(wxWindowBase::Reparent(pNewParent));};
+    { return(wxWindowBase::Reparent(pNewParent));}
 }; // end of wxWindow
 
 class wxWindowCreationHook