projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made wxHeaderColumnBase dtor virtual to avoid gcc warnings
[wxWidgets.git]
/
include
/
wx
/
msw
/
button.h
diff --git
a/include/wx/msw/button.h
b/include/wx/msw/button.h
index 571024979335d69490bd912a6ac9d2e526d4d447..1ee21c4d1e27d4822580c37159386e7b5e9f88e8 100644
(file)
--- a/
include/wx/msw/button.h
+++ b/
include/wx/msw/button.h
@@
-12,21
+12,17
@@
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
-#ifdef __GNUG__
-#pragma interface "button.h"
-#endif
-
// ----------------------------------------------------------------------------
// Pushbutton
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// Pushbutton
// ----------------------------------------------------------------------------
-class WXDLL
EXPORT
wxButton : public wxButtonBase
+class WXDLL
IMPEXP_CORE
wxButton : public wxButtonBase
{
public:
wxButton() { }
wxButton(wxWindow *parent,
wxWindowID id,
{
public:
wxButton() { }
wxButton(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-38,7
+34,7
@@
public:
bool Create(wxWindow *parent,
wxWindowID id,
bool Create(wxWindow *parent,
wxWindowID id,
- const wxString& label,
+ const wxString& label
= wxEmptyString
,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
@@
-47,26
+43,29
@@
public:
virtual ~wxButton();
virtual ~wxButton();
- virtual void SetDefault();
+ virtual wxWindow *SetDefault();
+
+ // overridden base class methods
+ virtual void SetLabel(const wxString& label);
+ virtual bool SetBackgroundColour(const wxColour &colour);
+ virtual bool SetForegroundColour(const wxColour &colour);
// implementation from now on
virtual void Command(wxCommandEvent& event);
// implementation from now on
virtual void Command(wxCommandEvent& event);
- virtual
long
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+ virtual
WXLRESULT
MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual bool MSWCommand(WXUINT param, WXWORD id);
-#ifdef __WIN32__
- // coloured buttons support
- virtual bool SetBackgroundColour(const wxColour &colour);
- virtual bool SetForegroundColour(const wxColour &colour);
-
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+ virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
+
+ // returns true if the platform should explicitly apply a theme border
+ virtual bool CanApplyThemeBorder() const { return false; }
private:
void MakeOwnerDrawn();
private:
void MakeOwnerDrawn();
-#endif // __WIN32__
protected:
protected:
- // send a notification event, return
TRUE
if processed
+ // send a notification event, return
true
if processed
bool SendClickEvent();
// default button handling
bool SendClickEvent();
// default button handling
@@
-78,11
+77,9
@@
protected:
// usually overridden base class virtuals
virtual wxSize DoGetBestSize() const;
// usually overridden base class virtuals
virtual wxSize DoGetBestSize() const;
- virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
private:
private:
- DECLARE_DYNAMIC_CLASS(wxButton)
+ DECLARE_DYNAMIC_CLASS
_NO_COPY
(wxButton)
};
};
-#endif
- // _WX_BUTTON_H_
+#endif // _WX_BUTTON_H_