Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of new wxMac code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-27 07:15:02 +00:00
parent 34a336adb6
commit 4f30545658
18 changed files with 322 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/wx/mac/carbon/stattext.h
View File

@@ -18,11 +18,10 @@
class WXDLLEXPORT wxStaticText: public wxStaticTextBase
{
DECLARE_DYNAMIC_CLASS(wxStaticText)
public:
inline wxStaticText() : m_label() { }
public:
wxStaticText() { }
inline wxStaticText(wxWindow *parent, wxWindowID id,
wxStaticText(wxWindow *parent, wxWindowID id,
const wxString& label,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
@@ -43,19 +42,12 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
void SetLabel( const wxString &str ) ;
bool SetFont( const wxFont &font );
// operations
virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
// events
void DrawParagraph(wxDC &dc, wxString paragraph, int &y);
void OnPaint( wxPaintEvent &event ) ;
void OnDraw( wxDC &dc ) ;
protected :
virtual wxSize DoGetBestSize() const ;
virtual bool AcceptsFocus() const { return FALSE; }
private :
wxString m_label ;
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
};
#endif