X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/903f689bf7c3c379cba45881373aa9bdd15d6e70..616c0d1f3ac084bb92f0a75dc48812e8647f1b22:/include/wx/gtk/bmpbuttn.h?ds=sidebyside diff --git a/include/wx/gtk/bmpbuttn.h b/include/wx/gtk/bmpbuttn.h index 6800d97bf4..15966f3f41 100644 --- a/include/wx/gtk/bmpbuttn.h +++ b/include/wx/gtk/bmpbuttn.h @@ -1,72 +1,47 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: bmpbutton.h +// Name: wx/gtk/bmpbutton.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +#ifndef _WX_GTK_BMPBUTTON_H_ +#define _WX_GTK_BMPBUTTON_H_ -#ifndef __BMPBUTTONH__ -#define __BMPBUTTONH__ - -#ifdef __GNUG__ -#pragma interface -#endif - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxBitmapButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const char *wxButtonNameStr; - -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // wxBitmapButton -//----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- -class wxBitmapButton: public wxControl +class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase { - DECLARE_DYNAMIC_CLASS(wxBitmapButton) - - public: - - wxBitmapButton(void); - inline wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) +public: + wxBitmapButton() { } + + wxBitmapButton(wxWindow *parent, + wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr) { - Create(parent, id, bitmap, pos, size, style, validator, name); + Create(parent, id, bitmap, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - void SetDefault(void); - void SetLabel( const wxString &label ); - wxString GetLabel(void) const; - virtual void SetLabel(const wxBitmap& bitmap) { SetBitmapLabel(bitmap); } - virtual void SetBitmapLabel( const wxBitmap& bitmap ); - wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_bitmap; } - - public: - - wxBitmap m_bitmap; - + + bool Create(wxWindow *parent, + wxWindowID id, + const wxBitmap& bitmap, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr); + +private: + DECLARE_DYNAMIC_CLASS(wxBitmapButton) }; -#endif // __BMPBUTTONH__ + +#endif // _WX_GTK_BMPBUTTON_H_