merging in the toolbar changes

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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index a2514e757474b4403c78461c723f0dea3fb2e181..f5bb924c9160b8981aba245f9133def6240e24b6 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxRadioButtonNameStr;
 
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
@@ -47,9 +47,8 @@ class WXDLLEXPORT wxRadioButton: public wxControl
   virtual void SetValue(bool val);
   virtual bool GetValue(void) const ;
 
+  bool MSWCommand(WXUINT param, WXWORD id);
   void Command(wxCommandEvent& event);
-  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 };
 
 // Not implemented