Toolbar/tooltip udates

[wxWidgets.git] / include / wx / mac / stattext.h

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 45d6e4e326625da438f118bd26e7168f4c87c645..787eaf29ed6d25d2e134df8f8765d6abd93b6966 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -20,7 +20,7 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxStaticText)
  public:

-  inline wxStaticText() { }
+  inline wxStaticText() : m_label() { }

 
   inline wxStaticText(wxWindow *parent, wxWindowID id,
            const wxString& label,
 
   inline wxStaticText(wxWindow *parent, wxWindowID id,
            const wxString& label,


@@ -41,14 +41,16 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 
   // accessors
   void SetLabel( const wxString &str ) ;
 
   // accessors
   void SetLabel( const wxString &str ) ;

+  bool SetFont( const wxFont &font );
+

   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events
   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // events

-  void DrawParagraph(wxDC &dc, wxString paragraph);
+  void DrawParagraph(wxDC &dc, wxString paragraph, int &y);

   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;

-  wxSize DoGetBestSize() const ;
+  virtual wxSize DoGetBestSize() const ;

   virtual bool AcceptsFocus() const { return FALSE; }
  private :
        wxString        m_label ;
   virtual bool AcceptsFocus() const { return FALSE; }
  private :
        wxString        m_label ;