Correct compilation conditions for wxURL::SetProxy.

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

diff --git a/include/wx/univ/statline.h b/include/wx/univ/statline.h
index 5896a480607ae4ddf83d82ff33bf527bd8c27ee3..56545ae3f4a1a1e805e2341f01807044736a218f 100644 (file)
--- a/include/wx/univ/statline.h
+++ b/include/wx/univ/statline.h
@@ -8,8 +8,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma interface "statline.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "univstatline.h"

 #endif
 
 #ifndef _WX_UNIV_STATLINE_H_
 #endif
 
 #ifndef _WX_UNIV_STATLINE_H_


@@ -26,14 +26,14 @@ public:
                  wxCoord length,
                  long style = wxLI_HORIZONTAL)
     {
                  wxCoord length,
                  long style = wxLI_HORIZONTAL)
     {

-        Create(parent, -1, pos,
-               style & wxLI_VERTICAL ? wxSize(-1, length)
-                                     : wxSize(length, -1),
+        Create(parent, wxID_ANY, pos,
+               style & wxLI_VERTICAL ? wxSize(wxDefaultCoord, length)
+                                     : wxSize(length, wxDefaultCoord),

                style);
     }
 
     wxStaticLine(wxWindow *parent,
                style);
     }
 
     wxStaticLine(wxWindow *parent,

-                 wxWindowID id,
+                 wxWindowID id = wxID_ANY,

                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,
                  const wxPoint &pos = wxDefaultPosition,
                  const wxSize &size = wxDefaultSize,
                  long style = wxLI_HORIZONTAL,


@@ -43,7 +43,7 @@ public:
     }
 
     bool Create(wxWindow *parent,
     }
 
     bool Create(wxWindow *parent,

-                wxWindowID id,
+                wxWindowID id = wxID_ANY,

                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,
                 const wxPoint &pos = wxDefaultPosition,
                 const wxSize &size = wxDefaultSize,
                 long style = wxLI_HORIZONTAL,