Use re_search directly instead of regexec when using the GNU regex lib

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

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index c493ae7cc5db4b1c24b40657a47136f258d8aec1..ab038d670035879f35e199def6d4b30796dc3d5b 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -6,16 +6,12 @@
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     14.10.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_UNIV_STATUSBR_H_
 #define _WX_UNIV_STATUSBR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univstatusbr.h"
-#endif
-

 #include "wx/univ/inpcons.h"
 #include "wx/arrstr.h"
 
 #include "wx/univ/inpcons.h"
 #include "wx/arrstr.h"
 


@@ -30,7 +26,7 @@ public:
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,
     wxStatusBarUniv() { Init(); }
 
     wxStatusBarUniv(wxWindow *parent,

-                    wxWindowID id = -1,
+                    wxWindowID id = wxID_ANY,

                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {
                     long style = 0,
                     const wxString& name = wxPanelNameStr)
     {


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

-                wxWindowID id = -1,
+                wxWindowID id = wxID_ANY,

                 long style = 0,
                 const wxString& name = wxPanelNameStr);
 
                 long style = 0,
                 const wxString& name = wxPanelNameStr);