fix wxOS2 build where OpenGL headers are available but there's no wxGlCanvas implemen...

[wxWidgets.git] / include / wx / osx / carbon / toolbar.h

diff --git a/include/wx/osx/carbon/toolbar.h b/include/wx/osx/carbon/toolbar.h
index efe961cdffb7856caf44d3b24d5ff58d88f47a5e..6dd02028cb2647f093897ded1d4df9a8f25d3456 100644 (file)
--- a/include/wx/osx/carbon/toolbar.h
+++ b/include/wx/osx/carbon/toolbar.h
@@ -67,7 +67,7 @@ class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
     void OnMouse(wxMouseEvent& event) ;
     virtual void MacSuperChangedPosition() ;
 
     void OnMouse(wxMouseEvent& event) ;
     virtual void MacSuperChangedPosition() ;
 

-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxOSX_USE_NATIVE_TOOLBAR

     bool MacInstallNativeToolbar(bool usesNative);
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
     bool MacInstallNativeToolbar(bool usesNative);
     bool MacWantsNativeToolbar();
     bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;


@@ -97,9 +97,9 @@ protected:
                                           const wxString& label);
 
     DECLARE_EVENT_TABLE()
                                           const wxString& label);
 
     DECLARE_EVENT_TABLE()

-#if wxMAC_USE_NATIVE_TOOLBAR
+#if wxOSX_USE_NATIVE_TOOLBAR

     bool m_macUsesNativeToolbar ;
     bool m_macUsesNativeToolbar ;

-    void* m_macHIToolbarRef ;
+    void* m_macToolbar ;

 #endif
 };
 
 #endif
 };