key/char event changes for inline editing (japanese/hiragana etc)

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

diff --git a/include/wx/os2/radiobut.h b/include/wx/os2/radiobut.h
index 8d23a64bcbcc9a6085613b1f80ce673aacf2076c..34777de036d9154c846b42f8f86b178e8aa35468 100644 (file)
--- a/include/wx/os2/radiobut.h
+++ b/include/wx/os2/radiobut.h
@@ -14,33 +14,29 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
 public:
-    inline wxRadioButton() {}
+    inline wxRadioButton() { Init(); }
     inline wxRadioButton( wxWindow*          pParent
                          ,wxWindowID         vId
                          ,const wxString&    rsLabel
                          ,const wxPoint&     rPos = wxDefaultPosition
                          ,const wxSize&      rSize = wxDefaultSize
                          ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                          ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                          ,const wxString&    rsName = wxRadioButtonNameStr
                          )
     {
+        Init();
+
         Create( pParent
                ,vId
                ,rsLabel
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -51,20 +47,32 @@ public:
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#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 MRESULT OS2WindowProc( WXUINT   uMsg
+                                  ,WXWPARAM wParam
+                                  ,WXLPARAM lParam
+                                 );
+    virtual void    SetFocus(void);
+
+protected:
+    virtual wxSize DoGetBestSize() const;
+
 private:
+    void Init(void);
+
+    bool                            m_bFocusJustSet;
+
     DECLARE_DYNAMIC_CLASS(wxRadioButton)
 }; // end of wxRadioButton