projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make wxGTK1.2 compile again.
[wxWidgets.git]
/
include
/
wx
/
palmos
/
button.h
diff --git
a/include/wx/palmos/button.h
b/include/wx/palmos/button.h
index 62d8e5f0378e1b9e5a670dbcdca5d2d369f48a16..4c1118b475b011c347f26969d0c90b4ecb19deff 100644
(file)
--- a/
include/wx/palmos/button.h
+++ b/
include/wx/palmos/button.h
@@
-12,10
+12,6
@@
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "button.h"
-#endif
-
// ----------------------------------------------------------------------------
// Pushbutton
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// Pushbutton
// ----------------------------------------------------------------------------
@@
-47,22
+43,16
@@
public:
virtual ~wxButton();
virtual ~wxButton();
- virtual
void
SetDefault();
+ virtual
wxWindow *
SetDefault();
// implementation from now on
virtual void Command(wxCommandEvent& event);
// implementation from now on
virtual void Command(wxCommandEvent& event);
- virtual bool MSWCommand(WXUINT param, WXWORD id);
-
- virtual void ApplyParentThemeBackground(const wxColour& bg)
- {
- // avoide switching into owner-drawn mode
- wxControl::SetBackgroundColour(bg);
- }
-protected:
// send a notification event, return true if processed
bool SendClickEvent();
// send a notification event, return true if processed
bool SendClickEvent();
+protected:
+
// default button handling
void SetTmpDefault();
void UnsetTmpDefault();
// default button handling
void SetTmpDefault();
void UnsetTmpDefault();
@@
-72,7
+62,6
@@
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:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)
private:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxButton)