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 1117b6fc9aef7db2d0129785ea5fc6c3fd9a2eb4..8884f70452a33e569a510a7cdc5304b051b8b356 100644 (file)
--- a/include/wx/mac/stattext.h
+++ b/include/wx/mac/stattext.h
@@ -12,19 +12,15 @@
 #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
 

-#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:
 {
   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,


@@ -44,11 +40,22 @@ class WXDLLEXPORT wxStaticText: public wxControl
            const wxString& name = wxStaticTextNameStr);
 
   // accessors
            const wxString& name = wxStaticTextNameStr);
 
   // accessors

-  void SetLabel(const wxString& , bool resize );
-  void SetLabel( const wxString &str ) { SetLabel( str , true ) ; }
+  void SetLabel( const wxString &str ) ;
+  bool SetFont( const wxFont &font );
+

   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};
   virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {};
   // 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 ) ;
+  virtual wxSize DoGetBestSize() const ;
+  virtual bool AcceptsFocus() const { return FALSE; }
+ private :
+       wxString        m_label ;
+
+   DECLARE_EVENT_TABLE()

 };
 
 #endif
 };
 
 #endif