forcefully disable wxUSE_JOYSTICK too

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

diff --git a/include/wx/msw/tglbtn.h b/include/wx/msw/tglbtn.h
index 11367023977f96f3bd118c6f4eef39e5408fa66f..a6dc79548637a82bfad6ee25ad87cd20198af8f2 100644 (file)
--- a/include/wx/msw/tglbtn.h
+++ b/include/wx/msw/tglbtn.h
@@ -7,13 +7,13 @@
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II
 // Created:     08.02.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Johnny C. Norris II

-// License:     Rocketeer license
+// License:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TOGGLEBUTTON_H_
 #define _WX_TOGGLEBUTTON_H_
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxCheckBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxCheckBoxNameStr[];

 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl
 
 // Checkbox item (single checkbox)
 class WXDLLEXPORT wxToggleButton : public wxControl


@@ -45,13 +45,12 @@ public:
     virtual bool GetValue() const ;
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual bool GetValue() const ;
 
     virtual bool MSWCommand(WXUINT param, WXWORD id);

-    virtual void SetLabel(const wxString& label);

     virtual void Command(wxCommandEvent& event);
     virtual void Command(wxCommandEvent& event);

+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxBorder GetDefaultBorder() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxBorder GetDefaultBorder() const;

-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)