Minor corrections to make dist after reports

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

diff --git a/include/wx/univ/statusbr.h b/include/wx/univ/statusbr.h
index 5645abd0840659cad5b8d6dc2ffbe9b97259806a..88528562a35a4f7c9e22f105c252fbbf0dc94c51 100644 (file)
--- a/include/wx/univ/statusbr.h
+++ b/include/wx/univ/statusbr.h
@@ -12,10 +12,6 @@
 #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"
 


@@ -23,7 +19,7 @@
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 
 // wxStatusBar: a window near the bottom of the frame used for status info
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxStatusBarUniv : public wxStatusBarBase,
+class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase,

                                     public wxInputConsumer
 {
 public:
                                     public wxInputConsumer
 {
 public:


@@ -62,6 +58,10 @@ public:
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 
     virtual int GetBorderX() const;
     virtual int GetBorderY() const;
 

+    // wxInputConsumer pure virtual
+    virtual wxWindow *GetInputWindow() const
+        { return wx_const_cast(wxStatusBar*, this); }
+

 protected:
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);
 protected:
     // recalculate the field widths
     void OnSize(wxSizeEvent& event);


@@ -69,10 +69,6 @@ protected:
     // draw the statusbar
     virtual void DoDraw(wxControlRenderer *renderer);
 
     // draw the statusbar
     virtual void DoDraw(wxControlRenderer *renderer);
 

-    // wxInputConsumer pure virtual
-    virtual wxWindow *GetInputWindow() const
-        { return wxConstCast(this, wxStatusBar); }
-

     // tell them about our preferred height
     virtual wxSize DoGetBestSize() const;
 
     // tell them about our preferred height
     virtual wxSize DoGetBestSize() const;