Remove the Innotek for OS/2 addition...configure now deals with this correctly on...

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

diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index c6819e51a50c27ea2c89e80cbde3a6d912cf3ae0..2324b012049032517a25f148f14f85898b80ada0 100644 (file)
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -4,18 +4,21 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
 #include "wx/defs.h"
+
+#if wxUSE_STATLINE
+
 #include "wx/object.h"
 #include "wx/list.h"
 #include "wx/control.h"
@@ -26,30 +29,26 @@
 
 class wxStaticLine;
 
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern const char *wxStaticTextNameStr;
-
 //-----------------------------------------------------------------------------
 // wxStaticLine
 //-----------------------------------------------------------------------------
 
-class wxStaticLine: public wxControl
+class wxStaticLine : public wxStaticLineBase
 {
-  DECLARE_DYNAMIC_CLASS(wxStaticLine)
-
-  public:
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)
 
-    wxStaticLine(void);
+public:
+    wxStaticLine();
     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,
-      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 // __GTKSTATICLINEH__
+#endif 
+  // wxUSE_STATLINE
+  
+#endif 
+  // __GTKSTATICLINEH__