Update to Scintilla 1.48

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

diff --git a/include/wx/mac/stattext.h b/include/wx/mac/stattext.h
index 934d7e81186971638f1ddf6c33eb6065ab028cbc..8884f70452a33e569a510a7cdc5304b051b8b356 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "stattext.h"
 #endif
 
 #pragma interface "stattext.h"
 #endif
 


@@ -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,11 +41,13 @@ 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 ) ;
   virtual wxSize DoGetBestSize() const ;
   void OnPaint( wxPaintEvent &event ) ;
   void OnDraw( wxDC &dc ) ;
   virtual wxSize DoGetBestSize() const ;