1. Moved m_usePrimary to wxClipboardBase as it's now also used by wxMSW/wxMac

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

diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h
index 022c4e51ee382d87295d7e0d51c09f24a76ca6bc..afa3db8486e24846bce6e30c1347ecd247c94837 100644 (file)
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -12,10 +12,6 @@
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 
 #ifndef   _STATBR95_H
 #define   _STATBR95_H
 

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

 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase
 #if wxUSE_NATIVE_STATUSBAR
 
 class WXDLLEXPORT wxStatusBar95 : public wxStatusBarBase


@@ -26,7 +22,7 @@ public:
     wxStatusBar95(wxWindow *parent,
                   wxWindowID id = wxID_ANY,
                   long style = wxST_SIZEGRIP,
     wxStatusBar95(wxWindow *parent,
                   wxWindowID id = wxID_ANY,
                   long style = wxST_SIZEGRIP,

-                  const wxString& name = wxEmptyString)
+                  const wxString& name = wxStatusBarNameStr)

     {
         (void)Create(parent, id, style, name);
     }
     {
         (void)Create(parent, id, style, name);
     }


@@ -34,7 +30,7 @@ public:
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,
     bool Create(wxWindow *parent,
                 wxWindowID id = wxID_ANY,
                 long style = wxST_SIZEGRIP,

-                const wxString& name = wxEmptyString);
+                const wxString& name = wxStatusBarNameStr);

 
     virtual ~wxStatusBar95();
 
 
     virtual ~wxStatusBar95();
 


@@ -61,6 +57,9 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 

+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
+                                    WXWPARAM wParam,
+                                    WXLPARAM lParam);

 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();
 protected:
     void CopyFieldsWidth(const int widths[]);
     void SetFieldsWidth();


@@ -68,10 +67,6 @@ protected:
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);
 
     // override base class virtual
     void DoMoveWindow(int x, int y, int width, int height);
 

-    virtual WXLRESULT MSWWindowProc(WXUINT nMsg,
-                                    WXWPARAM wParam,
-                                    WXLPARAM lParam);
-

 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 };
 private:
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxStatusBar95)
 };