projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup of previous fix
[wxWidgets.git]
/
include
/
wx
/
msw
/
tglbtn.h
diff --git
a/include/wx/msw/tglbtn.h
b/include/wx/msw/tglbtn.h
index a6dc79548637a82bfad6ee25ad87cd20198af8f2..63dc148dfae127a29b732117ba9f69e10e8a64e1 100644
(file)
--- a/
include/wx/msw/tglbtn.h
+++ b/
include/wx/msw/tglbtn.h
@@
-13,10
+13,10
@@
#ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_
#ifndef _WX_TOGGLEBUTTON_H_
#define _WX_TOGGLEBUTTON_H_
-extern WXDLL
EXPORT_DATA(const wxC
har) wxCheckBoxNameStr[];
+extern WXDLL
IMPEXP_DATA_CORE(const c
har) wxCheckBoxNameStr[];
// Checkbox item (single checkbox)
// Checkbox item (single checkbox)
-class WXDLL
EXPORT wxToggleButton : public wxControl
+class WXDLL
IMPEXP_CORE wxToggleButton : public wxToggleButtonBase
{
public:
wxToggleButton() {}
{
public:
wxToggleButton() {}
@@
-44,13
+44,19
@@
public:
virtual void SetValue(bool value);
virtual bool GetValue() const ;
virtual void SetValue(bool value);
virtual bool GetValue() const ;
+ virtual void SetLabel(const wxString& label);
+
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual void Command(wxCommandEvent& event);
- virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;
+
+ // returns true if the platform should explicitly apply a theme border
+ virtual bool CanApplyThemeBorder() const { return false; }
protected:
protected:
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
virtual wxSize DoGetBestSize() const;
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)