X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42e69d6b435a4dd5415caf3750db62cf45b6f373..d61f7200331a1cd1a3b2353292e6801511ccbc5d:/include/wx/msw/stattext.h diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h index 090e96eec1..0ceef4c977 100644 --- a/include/wx/msw/stattext.h +++ b/include/wx/msw/stattext.h @@ -1,64 +1,58 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.h +// Name: wx/msw/stattext.h // Purpose: wxStaticText class // Author: Julian Smart // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_STATTEXT_H_ #define _WX_STATTEXT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "stattext.h" #endif -#include "wx/control.h" - -WXDLLEXPORT_DATA(extern const char*) wxStaticTextNameStr; - -class WXDLLEXPORT wxStaticText : public wxControl +class WXDLLEXPORT wxStaticText : public wxStaticTextBase { -DECLARE_DYNAMIC_CLASS(wxStaticText) - public: wxStaticText() { } - - wxStaticText(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr) + + wxStaticText(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticTextNameStr) { Create(parent, id, label, pos, size, style, name); } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticTextNameStr); - - // accessors - void SetLabel(const wxString& label); - - // overriden base class virtuals - virtual bool AcceptsFocus() const { return FALSE; } - - // callbacks - virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, - WXUINT message, WXWPARAM wParam, WXLPARAM lParam); - virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); + + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxString& name = wxStaticTextNameStr); + + // override some methods to resize the window properly + virtual void SetLabel(const wxString& label); + virtual bool SetFont( const wxFont &font ); protected: - virtual void DoSetSize(int x, int y, - int width, int height, + // implement/override some base class virtuals + virtual wxBorder GetDefaultBorder() const; + virtual void DoSetSize(int x, int y, int w, int h, int sizeFlags = wxSIZE_AUTO); + virtual wxSize DoGetBestSize() const; + virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const; + + DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText) }; #endif