Applied patch for wxComboBox and wxListBox to

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index 029c7cb62126b63d9adf9444dfa45addef0b9304..56e909673706a0c15235a5868a6095480a3b568e 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -14,6 +14,8 @@
 
 #include "wx/window.h"
 
 
 #include "wx/window.h"
 

+#if wxUSE_STATUSBAR
+

 // ----------------------------------------------------------------------------
 // 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
 // ----------------------------------------------------------------------------


@@ -45,6 +47,9 @@ public:
     virtual int GetBorderX() const = 0;
     virtual int GetBorderY() const = 0;
 
     virtual int GetBorderX() const = 0;
     virtual int GetBorderY() const = 0;
 

+    // don't want status bars to accept the focus at all
+    virtual bool AcceptsFocus() const { return FALSE; }
+

 protected:
     int     m_nFields;      // the current number of fields
     int    *m_statusWidths; // the width (if !NULL) of the fields
 protected:
     int     m_nFields;      // the current number of fields
     int    *m_statusWidths; // the width (if !NULL) of the fields


@@ -54,6 +59,11 @@ protected:
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;
     #include "wx/msw/statbr95.h"
 
     typedef wxStatusBar95 wxStatusBarReal;

+#elif defined(__WXMAC__)
+    #include "wx/generic/statusbr.h"
+    #include "wx/mac/statusbr.h"
+
+    typedef wxStatusBarMac wxStatusBarReal;

 #else
     #include "wx/generic/statusbr.h"
 
 #else
     #include "wx/generic/statusbr.h"
 


@@ -63,7 +73,7 @@ protected:
 // we can't just typedef wxStatusBar to be one of 95/Generic because we should
 // be able to forward declare it (done in several places) and because wxWin
 // RTTI wouldn't work then
 // we can't just typedef wxStatusBar to be one of 95/Generic because we should
 // be able to forward declare it (done in several places) and because wxWin
 // RTTI wouldn't work then

-class wxStatusBar : public wxStatusBarReal
+class WXDLLEXPORT wxStatusBar : public wxStatusBarReal

 {
 public:
     wxStatusBar() { }
 {
 public:
     wxStatusBar() { }


@@ -88,5 +98,7 @@ private:
     DECLARE_DYNAMIC_CLASS(wxStatusBar)
 };
 
     DECLARE_DYNAMIC_CLASS(wxStatusBar)
 };
 

+#endif
+

 #endif
     // _WX_STATUSBR_H_BASE_
 #endif
     // _WX_STATUSBR_H_BASE_