Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index 12d8d6995ea35796cb3220bc24776baf819121f8..0e58cb15ec908b75ca719c190f290a885f50e6ec 100644 (file)
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -2,9 +2,8 @@
 // Name:        stattext.h
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -31,7 +30,7 @@ class wxStaticText;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxStaticTextNameStr;
+extern const wxChar *wxStaticTextNameStr;
 
 //-----------------------------------------------------------------------------
 // wxStaticText
@@ -46,12 +45,16 @@ class wxStaticText: public wxControl
     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 );
+      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 );
+      long style = 0, const wxString &name = wxStaticTextNameStr );
     wxString GetLabel(void) const;
     void SetLabel( const wxString &label );
+    
+  // implementation
+    
+    void ApplyWidgetStyle();
 };
 
 #endif // __GTKSTATICTEXTH__