projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied patch #931719: "ESC closes dialog instead of combobox dropdown" (closes patch...
[wxWidgets.git]
/
include
/
wx
/
msw
/
button.h
diff --git
a/include/wx/msw/button.h
b/include/wx/msw/button.h
index 70f51f6fa5fede77054924b07612e1cfceaec609..bb844575e3b5d699db8acc0ad00eb3f44061ecee 100644
(file)
--- a/
include/wx/msw/button.h
+++ b/
include/wx/msw/button.h
@@
-12,7
+12,7
@@
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "button.h"
#endif
#pragma interface "button.h"
#endif
@@
-51,9
+51,15
@@
public:
// 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);
+ virtual void ApplyParentThemeBackground(const wxColour& bg)
+ {
+ // avoide switching into owner-drawn mode
+ wxControl::SetBackgroundColour(bg);
+ }
+
#ifdef __WIN32__
// coloured buttons support
virtual bool SetBackgroundColour(const wxColour &colour);
#ifdef __WIN32__
// coloured buttons support
virtual bool SetBackgroundColour(const wxColour &colour);
@@
-69,12
+75,19
@@
protected:
// send a notification event, return TRUE if processed
bool SendClickEvent();
// send a notification event, return TRUE if processed
bool SendClickEvent();
+ // default button handling
+ void SetTmpDefault();
+ void UnsetTmpDefault();
+
+ // set or unset BS_DEFPUSHBUTTON style
+ static void SetDefaultStyle(wxButton *btn, bool on);
+
// 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;
+ virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const
;
private:
private:
- DECLARE_DYNAMIC_CLASS(wxButton)
+ DECLARE_DYNAMIC_CLASS
_NO_COPY
(wxButton)
};
#endif
};
#endif