wxTheColourDatabase->Find() can fail.

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

diff --git a/include/wx/mac/carbon/stattext.h b/include/wx/mac/carbon/stattext.h
index 17ecf98ad00e8b032ce4ee43e8dedbee174dcde7..042d0d3f5905e2f279e831876069170d566a49d4 100644 (file)
--- a/include/wx/mac/carbon/stattext.h
+++ b/include/wx/mac/carbon/stattext.h
@@ -12,17 +12,12 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "stattext.h"
-#endif
-

 class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 {
 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,
            const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize,


@@ -43,19 +38,13 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
   void SetLabel( const wxString &str ) ;
   bool SetFont( const wxFont &font );
 
   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 ) ;
+    virtual bool AcceptsFocus() const { return FALSE; }
+
+protected :
+

   virtual wxSize DoGetBestSize() const ;
   virtual wxSize DoGetBestSize() const ;

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

 
 

-   DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)

 };
 
 #endif
 };
 
 #endif