Fix a number of mingw compile errors.

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

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 12d8d6995ea35796cb3220bc24776baf819121f8..78241efe298173fd328878ab2f5c29e66b15b422 100644 (file)
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -1,57 +1,74 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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

+#ifndef _WX_GTK_STATTEXT_H_
+#define _WX_GTK_STATTEXT_H_

 
 

-#ifndef __GTKSTATICTEXTH__
-#define __GTKSTATICTEXTH__
+//-----------------------------------------------------------------------------
+// wxStaticText
+//-----------------------------------------------------------------------------

 
 

-#ifdef __GNUG__
-#pragma interface
-#endif
+class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
+{
+public:
+    wxStaticText();
+    wxStaticText(wxWindow *parent,
+                 wxWindowID id,
+                 const wxString &label,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize &size = wxDefaultSize,
+                 long style = 0,
+                 const wxString &name = wxStaticTextNameStr );

 
 

-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+    bool Create(wxWindow *parent,
+                wxWindowID id,
+                const wxString &label,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = 0,
+                const wxString &name = wxStaticTextNameStr );

 
 

-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+    void SetLabel( const wxString &label );

 
 

-class wxStaticText;
+    bool SetFont( const wxFont &font );

 
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

 
 

-extern const char *wxStaticTextNameStr;
+    // implementation
+    // --------------

 
 

-//-----------------------------------------------------------------------------
-// wxStaticText
-//-----------------------------------------------------------------------------
+protected:
+    virtual bool GTKWidgetNeedsMnemonic() const;
+    virtual void GTKWidgetDoSetMnemonic(GtkWidget* w);

 
 

-class wxStaticText: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxStaticText)
-
-  public:
-
-    wxStaticText(void);
-    wxStaticText( wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxStaticTextNameStr );
-    bool Create(  wxWindow *parent, wxWindowID id, const wxString &label,
-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      const long style = 0, const wxString &name = wxStaticTextNameStr );
-    wxString GetLabel(void) const;
-    void SetLabel( const wxString &label );
+    virtual void DoSetSize(int x, int y,
+                           int width, int height,
+                           int sizeFlags = wxSIZE_AUTO);
+
+    virtual wxSize DoGetBestSize() const;
+
+    virtual wxString DoGetLabel() const;
+    virtual void DoSetLabel(const wxString& str);
+#if wxUSE_MARKUP
+    virtual bool DoSetLabelMarkup(const wxString& markup);
+#endif // wxUSE_MARKUP
+
+private:
+    // Common part of SetLabel() and DoSetLabelMarkup().
+    typedef void (wxStaticText::*GTKLabelSetter)(GtkLabel *, const wxString&);
+
+    void GTKDoSetLabel(GTKLabelSetter setter, const wxString& label);
+
+
+    DECLARE_DYNAMIC_CLASS(wxStaticText)

 };
 
 };
 

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