added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index 2d31725292c3209aad1af305c2bfebb5ec21bdde..2324b012049032517a25f148f14f85898b80ada0 100644 (file)
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -4,14 +4,14 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

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

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface
 #endif
 
 #pragma interface
 #endif
 


@@ -29,32 +29,26 @@
 
 class wxStaticLine;
 
 
 class wxStaticLine;
 

-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxStaticTextNameStr;
-

 //-----------------------------------------------------------------------------
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxStaticLine
 //-----------------------------------------------------------------------------
 

-class wxStaticLine: public wxControl
+class wxStaticLine : public wxStaticLineBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxStaticLine)
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)

 
 

-  public:
-
-    wxStaticLine(void);
+public:
+    wxStaticLine();

     wxStaticLine( wxWindow *parent, wxWindowID id,
     wxStaticLine( wxWindow *parent, wxWindowID id,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
+            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
+            long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );

     bool Create(  wxWindow *parent, wxWindowID id,
     bool Create(  wxWindow *parent, wxWindowID id,

-      const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
-      long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );
-    
+            const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, 
+            long style = wxLI_HORIZONTAL, const wxString &name = wxStaticTextNameStr );

 };
 
 };
 

-#endif
-
-#endif // __GTKSTATICLINEH__
+#endif 
+  // wxUSE_STATLINE
+  
+#endif 
+  // __GTKSTATICLINEH__