X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef5c70f96f5e06e1c8f8119f51b99dd019583d2b..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/gtk/button.h?ds=sidebyside diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 919c528c22..190805702d 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -7,25 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifndef __GTKBUTTONH__ -#define __GTKBUTTONH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar wxButtonNameStr[]; +#ifndef _WX_GTK_BUTTON_H_ +#define _WX_GTK_BUTTON_H_ //----------------------------------------------------------------------------- // wxButton @@ -54,7 +37,7 @@ public: const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - virtual void SetDefault(); + virtual wxWindow *SetDefault(); virtual void SetLabel( const wxString &label ); virtual bool Enable( bool enable = TRUE ); @@ -64,7 +47,7 @@ public: // Since this wxButton doesn't derive from wxButtonBase (why?) we need // to override this here too... virtual bool ShouldInheritColours() const { return false; } - + static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); @@ -81,4 +64,4 @@ private: DECLARE_DYNAMIC_CLASS(wxButton) }; -#endif // __GTKBUTTONH__ +#endif // _WX_GTK_BUTTON_H_