wxMutexGuiEnter/Leave didn't work because this file is compiled with wxUSE_GUI=0

[wxWidgets.git] / contrib / samples / ogl / ogledit / palette.h

diff --git a/contrib/samples/ogl/ogledit/palette.h b/contrib/samples/ogl/ogledit/palette.h
index 2e9102f7db62ed768d0790a49313f6fc2eab93f4..5877981799b95edd9d74088d3601194769a78960 100644 (file)
--- a/contrib/samples/ogl/ogledit/palette.h
+++ b/contrib/samples/ogl/ogledit/palette.h
@@ -12,7 +12,7 @@
 #ifndef _OGLSAMPLE_PALETTE_H_
 #define _OGLSAMPLE_PALETTE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface
 #endif
 
@@ -21,7 +21,7 @@
 #if 0 // def __WXGTK__
 #include <wx/toolbar.h>
 #else
-#include <wx/tbarsmpl.h>
+#include <wx/deprecated/tbarsmpl.h>
 #endif
 
 /*