don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index e0efd1cff4e52b5b4eeb13e0bf2bc6609ed55e4d..241f5cbf8eb99a296c635d9ee96ff0cfed19356d 100644 (file)
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -90,7 +90,7 @@ protected:
     bool m_bEllipsized;
 };
 
     bool m_bEllipsized;
 };
 

-WX_DECLARE_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray);
+WX_DECLARE_EXPORTED_OBJARRAY(wxStatusBarPane, wxStatusBarPaneArray);

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


@@ -186,13 +186,15 @@ protected:
 
     // wxWindow overrides:
 
 
     // wxWindow overrides:
 

-    virtual void DoSetToolTip( wxToolTip *tip )
+#if wxUSE_TOOLTIPS
+   virtual void DoSetToolTip( wxToolTip *tip )

         {
             wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS),
                          "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!");
             wxWindow::DoSetToolTip(tip);
         }
         {
             wxASSERT_MSG(!HasFlag(wxSTB_SHOW_TIPS),
                          "Do not set tooltip(s) manually when using wxSTB_SHOW_TIPS!");
             wxWindow::DoSetToolTip(tip);
         }

-
+#endif
+   

     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
 
     virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }