Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/include/wx/msw/statusbar.h b/include/wx/msw/statusbar.h
index e942dd56b990582187531825fb1c940cd391cf28..1e9ca990548e9af9888806276ca1765133127602 100644 (file)
--- a/include/wx/msw/statusbar.h
+++ b/include/wx/msw/statusbar.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        wx/msw/statbr.h
+// Name:        wx/msw/statusbar.h

 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     native implementation of wxStatusBar
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -62,6 +62,7 @@ protected:
     virtual void DoUpdateStatusText(int number);
 
     // override some base class virtuals
     virtual void DoUpdateStatusText(int number);
 
     // override some base class virtuals

+    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle = NULL) const;

     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 #if wxUSE_TOOLTIPS
     virtual wxSize DoGetBestSize() const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
 #if wxUSE_TOOLTIPS


@@ -75,8 +76,10 @@ protected:
     // used by DoUpdateStatusText()
     wxClientDC *m_pDC;
 
     // used by DoUpdateStatusText()
     wxClientDC *m_pDC;
 

+#if wxUSE_TOOLTIPS

     // the tooltips used when wxSTB_SHOW_TIPS is given
     wxVector<wxToolTip*> m_tooltips;
     // the tooltips used when wxSTB_SHOW_TIPS is given
     wxVector<wxToolTip*> m_tooltips;

+#endif

 
 private:
     struct MSWBorders
 
 private:
     struct MSWBorders