fix for [ 1020924 ] wx.Display.IsPrimary is wrong

[wxWidgets.git] / include / wx / msw / statbr95.h

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index f6f56cfe1d065beaed50ff9d0b40a41bf665df45..980a919feb8ccad30532d5d92b2cf5ba343b24bc 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,7 +12,7 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "statbr95.h"
 #endif
 
 #pragma interface "statbr95.h"
 #endif
 


@@ -24,7 +24,7 @@ public:
     // ctors and such
     wxStatusBar95();
     wxStatusBar95(wxWindow *parent,
     // ctors and such
     wxStatusBar95();
     wxStatusBar95(wxWindow *parent,

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

                   long style = wxST_SIZEGRIP,
                   const wxString& name = wxEmptyString)
     {
                   long style = wxST_SIZEGRIP,
                   const wxString& name = wxEmptyString)
     {


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

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

                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxEmptyString);
 
                 long style = wxST_SIZEGRIP,
                 const wxString& name = wxEmptyString);
 


@@ -48,6 +48,9 @@ public:
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
 
     // set status line fields' widths
     virtual void SetStatusWidths(int n, const int widths_field[]);
 

+    // set status line fields' styles
+    virtual void SetStatusStyles(int n, const int styles[]);
+

     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 
     // sets the minimal vertical size of the status bar
     virtual void SetMinHeight(int height);
 


@@ -66,7 +69,7 @@ protected:
     void DoMoveWindow(int x, int y, int width, int height);
 
 private:
     void DoMoveWindow(int x, int y, int width, int height);
 
 private:

-    DECLARE_DYNAMIC_CLASS(wxStatusBar95);
+    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)

 };
 
 #endif  // wxUSE_NATIVE_STATUSBAR
 };
 
 #endif  // wxUSE_NATIVE_STATUSBAR