Reapply wxWeakRef patch again

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

diff --git a/include/wx/gtk/statline.h b/include/wx/gtk/statline.h
index 803ae2018acb3f06ab5b3c697c629e97a5541396..b71bd696e2dac8f4cf4a7780799e45fd7eb4b4f9 100644 (file)
--- a/include/wx/gtk/statline.h
+++ b/include/wx/gtk/statline.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,52 +7,43 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-

 #include "wx/defs.h"
 
 #if wxUSE_STATLINE
 
 #include "wx/defs.h"
 
 #if wxUSE_STATLINE
 

-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/control.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class wxStaticLine;
-
-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // wxStaticLine
 // wxStaticLine

-//-----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 

-class wxStaticLine : public wxStaticLineBase
+class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase

 {
 {

-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-

 public:
     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 = wxStaticLineNameStr);
+    bool Create(wxWindow *parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxLI_HORIZONTAL,
+                const wxString &name = wxStaticLineNameStr);

 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);

-    
+
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxStaticLine)

 };
 
 };
 

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