made GetPage() not virtual because it doesn't need to be virtual and this allows...

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

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index 77d837eec6da04a60408bcaaf6b4e875a4c8d3ac..e7ac4d74096e1e86a9d505ae737475c2cee1f83e 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -6,22 +6,18 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_GENERIC_STATUSBR_H_
 #define _WX_GENERIC_STATUSBR_H_
 

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

 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"
 #include "wx/arrstr.h"
 
 #include "wx/pen.h"
 #include "wx/font.h"
 #include "wx/statusbr.h"
 #include "wx/arrstr.h"
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxPanelNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxPanelNameStr;

 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {
 
 class WXDLLEXPORT wxStatusBarGeneric : public wxStatusBarBase
 {


@@ -93,7 +89,7 @@ public:
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);
   void SetBorderY(int y);
 
   void OnPaint(wxPaintEvent& event);

-  
+

   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 
   void OnLeftDown(wxMouseEvent& event);
   void OnRightDown(wxMouseEvent& event);
 


@@ -115,7 +111,6 @@ protected:
 
   int               m_borderX;
   int               m_borderY;
 
   int               m_borderX;
   int               m_borderY;

-  wxFont            m_defaultStatusBarFont;

   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;
 
   wxPen             m_mediumShadowPen;
   wxPen             m_hilightPen;