Various OS/2 changes to keep up with general library changes.

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

diff --git a/include/wx/os2/mdi.h b/include/wx/os2/mdi.h
index 556ab95a0c786d1efbe36765d5f14bbc6e88a261..a7d61b0cc3b9aac71a373554520420a22b8338b5 100644 (file)
--- a/include/wx/os2/mdi.h
+++ b/include/wx/os2/mdi.h
@@ -61,7 +61,8 @@ public:
     // just return a new class)
     virtual wxMDIClientWindow *OnCreateClient(void);
 
-    WXHMENU GetWindowMenu() const { return m_windowMenu; }
+    wxMenu* GetWindowMenu() const { return m_windowMenu; }
+//    void    SetWindowMenu(wxMwnu* pMenu);
 
     // MDI operations
     // --------------
@@ -93,7 +94,7 @@ protected:
 
     wxMDIClientWindow *             m_clientWindow;
     wxMDIChildFrame *               m_currentChild;
-    WXHMENU                         m_windowMenu;
+    wxMenu*                         m_windowMenu;
 
     // TRUE if MDI Frame is intercepting commands, not child
     bool m_parentFrameActive;

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 054d7f71cdbc344a4ba92d2fb1020b49d258e64d..1d3557cd10319c109df7c10c8c4ac4d3255d7c0a 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -17,7 +17,7 @@
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
 public:
-    inline wxRadioButton() {}
+    inline wxRadioButton() { Init(); }
     inline wxRadioButton( wxWindow*          pParent
                          ,wxWindowID         vId
                          ,const wxString&    rsLabel
@@ -30,6 +30,8 @@ public:
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {
+        Init();
+
         Create( pParent
                ,vId
                ,rsLabel
@@ -54,15 +56,24 @@ public:
 #endif
                 ,const wxString&    rsName = wxRadioButtonNameStr
                );
+
     virtual void SetLabel(const wxString& rsLabel);
     virtual void SetValue(bool bVal);
     virtual bool GetValue(void) const ;
 
-    bool OS2Command( WXUINT wParam
-                    ,WXWORD wId
-                   );
-    void Command(wxCommandEvent& rEvent);
+    bool         OS2Command( WXUINT wParam
+                            ,WXWORD wId
+                           );
+    void         Command(wxCommandEvent& rEvent);
+    virtual void SetFocus(void);
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
+    void Init(void);
+
+    bool                            m_bFocusJustSet;
+
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 }; // end of wxRadioButton
 

diff --git a/include/wx/os2/window.h b/include/wx/os2/window.h
index 15267db30711a7c9ef03972e2efc8d8c998b4f60..ab85057660a61137f0e326e86bff4e82894d6ab9 100644 (file)
--- a/include/wx/os2/window.h
+++ b/include/wx/os2/window.h
@@ -426,9 +426,6 @@ public:
     virtual bool    OS2TranslateMessage(WXMSG* pMsg);
     virtual void    OS2DestroyWindow(void);
 
-    // Detach "Window" menu from menu bar so it doesn't get deleted
-    void OS2DetachWindowMenu(void);
-
     // this function should return the brush to paint the window background
     // with or 0 for the default brush
     virtual WXHBRUSH OnCtlColor( WXHDC    hDC