Allow wxAutomationObject::GetInstance() create new instance if needed.

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

diff --git a/include/wx/motif/stattext.h b/include/wx/motif/stattext.h
index 4857cc4473d14bce0a8c10596c7d554b1d5eb194..cd9893ebfa2b2fe0103b106728bf830448dc2620 100644 (file)
--- a/include/wx/motif/stattext.h
+++ b/include/wx/motif/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        stattext.h
+// Name:        wx/motif/stattext.h

 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxStaticText class
 // Author:      Julian Smart
 // Modified by:


@@ -12,17 +12,13 @@
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 
 #ifndef _WX_STATTEXT_H_
 #define _WX_STATTEXT_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-#pragma interface "stattext.h"
-#endif
-
-class WXDLLEXPORT wxStaticText: public wxStaticTextBase
+class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase

 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 {
     DECLARE_DYNAMIC_CLASS(wxStaticText)

-        
+

 public:
     wxStaticText() { }
 public:
     wxStaticText() { }

-    
+

     wxStaticText(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
     wxStaticText(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,


@@ -32,30 +28,34 @@ public:
     {
         Create(parent, id, label, pos, size, style, name);
     }
     {
         Create(parent, id, label, pos, size, style, name);
     }

-    
+

     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxStaticTextNameStr);
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& label,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
         long style = 0,
         const wxString& name = wxStaticTextNameStr);

-    
+

     // implementation
     // --------------
     // implementation
     // --------------

-    
+

     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {
     // operations
     virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
     {

-        return FALSE;
+        return false;

     }
     }

-    
+

     virtual void SetLabel(const wxString& label);
     virtual void SetLabel(const wxString& label);

-    
+

     // Get the widget that corresponds to the label
     // (for font setting, label setting etc.)
     virtual WXWidget GetLabelWidget() const
         { return m_labelWidget; }
     // Get the widget that corresponds to the label
     // (for font setting, label setting etc.)
     virtual WXWidget GetLabelWidget() const
         { return m_labelWidget; }

-    
+
+    virtual void DoSetLabel(const wxString& str);
+    virtual wxString DoGetLabel() const;
+
+    virtual wxSize DoGetBestSize() const;

 protected:
     WXWidget              m_labelWidget;
 };
 protected:
     WXWidget              m_labelWidget;
 };