merge of new wxMac code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-03-27 07:15:02 +00:00
parent 34a336adb6
commit 4f30545658
18 changed files with 322 additions and 1258 deletions
--- a/include/wx/mac/carbon/statusbr.h
+++ b/include/wx/mac/carbon/statusbr.h
@@ -41,8 +41,6 @@ class WXDLLEXPORT wxStatusBarMac : public wxStatusBarGeneric
  ////////////////////////////////////////////////////////////////////////
  // Implementation

-  virtual void MacSuperEnabled( bool enable ) ;
-
  void OnPaint(wxPaintEvent& event);
 protected: