Updates to fix statusbar and menu errors.

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

diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h
index d78fdf1d5d03975ba64aeff44ca94df62f2a79b1..d9c6c8afd211308a5e21d2e3560cda5878520477 100644 (file)
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -5,88 +5,50 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __RADIOBUTH__
-#define __RADIOBUTH__
+#ifndef _WX_RADIOBUT_H_
+#define _WX_RADIOBUT_H_

 
 #ifdef __GNUG__
 #pragma interface "radiobut.h"
 #endif
 
 
 #ifdef __GNUG__
 #pragma interface "radiobut.h"
 #endif
 

-#include "wx/control.h"
-
-WXDLLEXPORT_DATA(extern const char*) wxRadioButtonNameStr;
-

 class WXDLLEXPORT wxRadioButton: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxRadioButton)
  protected:
  public:
   inline wxRadioButton(void) {}
 class WXDLLEXPORT wxRadioButton: public wxControl
 {
   DECLARE_DYNAMIC_CLASS(wxRadioButton)
  protected:
  public:
   inline wxRadioButton(void) {}

-  inline wxRadioButton(wxWindow *parent, const wxWindowID id,
+  inline wxRadioButton(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = 0,
+           const wxSize& size = wxDefaultSize, long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
 

-  bool Create(wxWindow *parent, const wxWindowID id,
+  bool Create(wxWindow *parent, wxWindowID id,

            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,

-           const wxSize& size = wxDefaultSize, const long style = 0,
+           const wxSize& size = wxDefaultSize, long style = 0,

            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr);
 
   virtual void SetLabel(const wxString& label);
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxRadioButtonNameStr);
 
   virtual void SetLabel(const wxString& label);

-  virtual void SetValue(const bool val);
+  virtual void SetValue(bool val);

   virtual bool GetValue(void) const ;
 
   virtual bool GetValue(void) const ;
 

-  void Command(wxCommandEvent& event);
-  virtual WXHBRUSH OnCtlColor(const WXHDC pDC, const WXHWND pWnd, const WXUINT nCtlColor,
-                       WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-};
-
-// Not implemented
-#if 0
-class WXDLLEXPORT wxBitmap ;
-
-WXDLLEXPORT_DATA(extern const char*) wxBitmapRadioButtonNameStr;
+  bool MSWCommand(WXUINT param, WXWORD id);
+  virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
+            WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

 
 

-class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
-  wxBitmap *theButtonBitmap;
- public:
-  inline wxBitmapRadioButton(void) { theButtonBitmap = NULL; }
-  inline wxBitmapRadioButton(wxWindow *parent, const wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, const long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, const wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, const long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr);
-
-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(const bool val) ;
-  virtual bool GetValue(void) const ;
+  void Command(wxCommandEvent& event);

 };
 };

-#endif

 
 #endif
 
 #endif

-    // __RADIOBUTH__
+    // _WX_RADIOBUT_H_