Last part from weak ref patch for event sink disconnection

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

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 3debaf7f2e8c326a617828791e323237079e1819..949d2cbf9c22105b87090934abe6fe980e7d628c 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -1,42 +1,20 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-
-#ifndef __GTKSTATICTEXTH__
-#define __GTKSTATICTEXTH__
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticText;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const wxChar *wxStaticTextNameStr;
+#ifndef _WX_GTK_STATTEXT_H_
+#define _WX_GTK_STATTEXT_H_

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

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

 {
 public:
     wxStaticText();
 {
 public:
     wxStaticText();


@@ -44,7 +22,7 @@ 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 );
 
                  long style = 0,
                  const wxString &name = wxStaticTextNameStr );
 


@@ -52,7 +30,7 @@ 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 );
 
                 long style = 0,
                 const wxString &name = wxStaticTextNameStr );
 


@@ -60,16 +38,31 @@ public:
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );

-    
+    bool SetForegroundColour( const wxColour& colour );
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+
+

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

-    
-    void ApplyWidgetStyle();

 
 protected:
 
 protected:

+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);
+
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+

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

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

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

-#endif // __GTKSTATICTEXTH__
+#endif
+    // _WX_GTK_STATTEXT_H_