removed spaces; added WXDLLEXPORTs; make overlay classes non copiable

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

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index 809568191e500544135a654d35497a202eab0b2a..4c4c1105075641f53390c62c856516a27df31e5e 100644 (file)
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,14 +7,9 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 
 #ifndef __GTKSTATICTEXTH__
 #define __GTKSTATICTEXTH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/list.h"


@@ -24,28 +19,25 @@
 // classes
 //-----------------------------------------------------------------------------
 
 // classes
 //-----------------------------------------------------------------------------
 

-class wxStaticText;
+class WXDLLIMPEXP_CORE wxStaticText;

 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // global data
 //-----------------------------------------------------------------------------
 

-extern const wxChar *wxStaticTextNameStr;
-

 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticText
 //-----------------------------------------------------------------------------
 

-class wxStaticText : public wxControl
+class WXDLLIMPEXP_CORE wxStaticText : public wxControl

 {
 public:
 {
 public:

-

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

-                 const wxSize &size = wxDefaultSize, 
+                 const wxSize &size = wxDefaultSize,

                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 


@@ -53,17 +45,32 @@ public:
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,
                 wxWindowID id,
                 const wxString &label,
                 const wxPoint &pos = wxDefaultPosition,

-                const wxSize &size = wxDefaultSize, 
+                const wxSize &size = wxDefaultSize,

                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 

+    bool SetFont( const wxFont &font );
+    bool SetForegroundColour( const wxColour& colour );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+    // see wx/stattext.h
+    void Wrap(int width);
+

     // implementation
     // implementation

-    void ApplyWidgetStyle();
+    // --------------

 
 protected:
 
 protected:

+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+    virtual wxSize DoGetBestSize() const;
+

     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStaticText)
 };