fixes to static box borders calculations and significant code cleanup (finalizes...

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

diff --git a/include/wx/gtk1/statline.h b/include/wx/gtk1/statline.h
index 8cbce8a56597028e937121a16ee8c8cb60d5f0db..aec537285678482829467139ff6bf5ddc25ed3af 100644 (file)
--- a/include/wx/gtk1/statline.h
+++ b/include/wx/gtk1/statline.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statline.h
+// Name:        wx/gtk/statline.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,42 +11,44 @@
 #ifndef __GTKSTATICLINEH__
 #define __GTKSTATICLINEH__
 
-#ifdef __GNUG__
-    #pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "statline.h"
 #endif
 
-#if !wxUSE_STATLINE
-    #error "This file should only be included if wxUSE_STATLINE == 1"
-#endif
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
+#include "wx/defs.h"
 
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
+#if wxUSE_STATLINE
 
-class wxStaticLine;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // wxStaticLine
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class wxStaticLine : public wxStaticLineBase
 {
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-
 public:
     wxStaticLine();
-    wxStaticLine( wxWindow *parent, wxWindowID id,
-            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 );
+    wxStaticLine(wxWindow *parent,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint &pos = wxDefaultPosition,
+                 const wxSize& size = wxDefaultSize,
+                 long style = wxLI_HORIZONTAL,
+                 const wxString &name = wxStaticTextNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLI_HORIZONTAL,
+                const wxString &name = wxStaticTextNameStr);
+
+    static wxVisualAttributes
+    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
+
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)
 };
 
 #endif // wxUSE_STATLINE
 
 #endif // __GTKSTATICLINEH__
+