fixing compiles under certain flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/cocoa/toolbar.mm b/src/osx/cocoa/toolbar.mm
index 1b8b4866fe4bafcc1fa7379794f912e8bb0391c3..a5e2638dafafe8623b48df77e0349d6c27643094 100644 (file)
--- a/src/osx/cocoa/toolbar.mm
+++ b/src/osx/cocoa/toolbar.mm
@@ -39,10 +39,6 @@ END_EVENT_TABLE()
 #pragma mark -
 #pragma mark Tool Implementation
 
 #pragma mark -
 #pragma mark Tool Implementation
 

-#if wxOSX_USE_COCOA
-#define wxOSX_USE_NATIVE_TOOLBAR 1
-#endif
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -162,6 +158,7 @@ public:
     
     void UpdateLabel()
     {
     
     void UpdateLabel()
     {

+#if wxOSX_USE_NATIVE_TOOLBAR

        if ( m_toolbarItem )
         {
             // strip mnemonics from the label for compatibility with the usual
        if ( m_toolbarItem )
         {
             // strip mnemonics from the label for compatibility with the usual


@@ -174,6 +171,7 @@ public:
             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }
             wxCFStringRef sh( GetShortHelp(), GetToolBarFontEncoding() );
             [m_toolbarItem setToolTip:sh.AsNSString()];
         }

+#endif

     }
 
     void Action()
     }
 
     void Action()


@@ -256,6 +254,8 @@ private:
 #endif
 };
 
 #endif
 };
 

+#if wxOSX_USE_NATIVE_TOOLBAR
+

 @interface wxNSToolbarItem : NSToolbarItem
 {
     wxToolBarTool* impl;
 @interface wxNSToolbarItem : NSToolbarItem
 {
     wxToolBarTool* impl;


@@ -284,6 +284,8 @@ private:
 
 @end
 
 
 @end
 

+#endif
+

 
 @interface wxNSToolBarButton : NSButton
 {
 
 @interface wxNSToolBarButton : NSButton
 {


@@ -298,6 +300,8 @@ private:
 
 @end
 
 
 @end
 

+#if wxOSX_USE_NATIVE_TOOLBAR
+

 @implementation wxNSToolbarItem
 
 - (id)initWithItemIdentifier: (NSString*) identifier
 @implementation wxNSToolbarItem
 
 - (id)initWithItemIdentifier: (NSString*) identifier


@@ -374,6 +378,8 @@ private:
 
 @end
 
 
 @end
 

+#endif
+

 @implementation wxNSToolBarButton
 
 - (id)initWithFrame:(NSRect)frame
 @implementation wxNSToolBarButton
 
 - (id)initWithFrame:(NSRect)frame

diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
index 5811ff545d442d3304b616e8116e5fa5d309b6f9..154d6ba4cefafcca42e18330edbfcc13fed8f006 100644 (file)
--- a/src/osx/glcanvas_osx.cpp
+++ b/src/osx/glcanvas_osx.cpp
@@ -60,7 +60,9 @@ wxGLContext::~wxGLContext()
 IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
 
 BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)
 IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
 
 BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow)

+#if wxOSX_USE_CARBON

     EVT_SIZE(wxGLCanvas::OnSize)
     EVT_SIZE(wxGLCanvas::OnSize)

+#endif

 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,
 END_EVENT_TABLE()
 
 wxGLCanvas::wxGLCanvas(wxWindow *parent,