corrections for wxMac

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

diff --git a/contrib/include/wx/applet/applet.h b/contrib/include/wx/applet/applet.h
index f51a37049791972a63c94c2261e3ff9900e5954d..3965ca1fc2b92f100cac067fef97b2bf645ed22d 100644 (file)
--- a/contrib/include/wx/applet/applet.h
+++ b/contrib/include/wx/applet/applet.h
@@ -44,7 +44,7 @@ Defines the abstract base class for wxApplet objects.
 class wxApplet : public wxPanel {
 private:
     DECLARE_ABSTRACT_CLASS(wxApplet);
-    DECLARE_EVENT_TABLE();
+    DECLARE_EVENT_TABLE()
 
 protected:
     //wxHtmlAppletWindow  *m_parent;

diff --git a/contrib/include/wx/applet/window.h b/contrib/include/wx/applet/window.h
index e8aac05b146824866785a2cd50198dcfa2255e34..340023b8867ac6a9b7899e08984f8c6e0e11b778 100644 (file)
--- a/contrib/include/wx/applet/window.h
+++ b/contrib/include/wx/applet/window.h
@@ -30,7 +30,9 @@
 #define __WX_APPLET_WINDOW_H
 
 #include "wx/html/htmlwin.h"
+#include "wx/hash.h"
 #include "wx/process.h"
+#include "wx/toolbar.h"
 
 // Forward declare
 class wxApplet;

diff --git a/contrib/samples/gizmos/dynsash/dynsash.cpp b/contrib/samples/gizmos/dynsash/dynsash.cpp
index 8e7bbb4efe37b02456f8c6a2b38495ab111f7cad..c6514563173a354735e0e9c3349f7a5e685c2a71 100644 (file)
--- a/contrib/samples/gizmos/dynsash/dynsash.cpp
+++ b/contrib/samples/gizmos/dynsash/dynsash.cpp
@@ -11,6 +11,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/app.h>
+#include <wx/frame.h>
 #include <wx/gizmos/dynamicsash.h>
 #include <wx/html/htmlwin.h>
 #include <wx/image.h>

diff --git a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
index 208745d8fb6e480dc9c0ad7bc2877e0a66fdbb13..9e52f704467d086608a65f516f21684a78bd349c 100644 (file)
--- a/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
+++ b/contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
@@ -13,6 +13,7 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include <wx/app.h>
+#include <wx/frame.h>
 #include <wx/choice.h>
 #include <wx/dcclient.h>
 #include <wx/gizmos/dynamicsash.h>

diff --git a/contrib/samples/gizmos/splittree/tree.cpp b/contrib/samples/gizmos/splittree/tree.cpp
index a422ac2816e38dbd3a45e54e41c44c4fe1148f31..fe574ddaf1e12c2f7325cf333ec5a2344bac013c 100644 (file)
--- a/contrib/samples/gizmos/splittree/tree.cpp
+++ b/contrib/samples/gizmos/splittree/tree.cpp
@@ -98,7 +98,7 @@ static char * icon2_xpm[] = {
 // resources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

diff --git a/contrib/samples/mmedia/mmboard.cpp b/contrib/samples/mmedia/mmboard.cpp
index 50e4232047a140e40e4bc9d5ce9ad92967bf77ac..8bdee6e9eb5c6df6950ae01c5abb51d5c4beb21c 100644 (file)
--- a/contrib/samples/mmedia/mmboard.cpp
+++ b/contrib/samples/mmedia/mmboard.cpp
@@ -37,7 +37,7 @@
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     #include "mondrian.xpm"
 #endif
 

diff --git a/contrib/samples/ogl/ogledit/ogledit.cpp b/contrib/samples/ogl/ogledit/ogledit.cpp
index 905b42f30d76864b88b835ac6b06e121e4f567a5..9118b74777c83be16509591280249618a9914193 100644 (file)
--- a/contrib/samples/ogl/ogledit/ogledit.cpp
+++ b/contrib/samples/ogl/ogledit/ogledit.cpp
@@ -33,7 +33,7 @@
 #include "doc.h"
 #include "view.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "ogl.xpm"
 #endif
 

diff --git a/contrib/samples/ogl/ogledit/palette.cpp b/contrib/samples/ogl/ogledit/palette.cpp
index 5df3af51e39837800bf8efe9f5636f1acf988ca0..988030f2cba09286a17ff3e382500b9bc6632bbe 100644 (file)
--- a/contrib/samples/ogl/ogledit/palette.cpp
+++ b/contrib/samples/ogl/ogledit/palette.cpp
@@ -36,7 +36,7 @@
 #include "palette.h"
 
 // Include pixmaps
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/tool1.xpm"
 #include "bitmaps/tool2.xpm"
@@ -93,7 +93,7 @@ EditorToolPalette *MyApp::CreatePalette(wxFrame *parent)
   wxBitmap PaletteTool3("TOOL3");
   wxBitmap PaletteTool4("TOOL4");
   wxBitmap PaletteArrow("ARROWTOOL");
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
   wxBitmap PaletteTool1(tool1_xpm);
   wxBitmap PaletteTool2(tool2_xpm);
   wxBitmap PaletteTool3(tool3_xpm);

diff --git a/contrib/samples/ogl/studio/cspalette.cpp b/contrib/samples/ogl/studio/cspalette.cpp
index 1479918ee48d40e1a44b9509bb77bff4d446ad3c..80b48ebd534284ecc1e6222a616bd481947fa226 100644 (file)
--- a/contrib/samples/ogl/studio/cspalette.cpp
+++ b/contrib/samples/ogl/studio/cspalette.cpp
@@ -36,7 +36,7 @@
 #include "cspalette.h"
 #include "symbols.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/arrow.xpm"
 #include "bitmaps/texttool.xpm"
 #endif
@@ -118,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent)
     wxBitmap PaletteArrow("arrowtool");
     wxBitmap TextTool("texttool");
     wxSize toolBitmapSize(32, 32);
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     wxBitmap PaletteArrow(arrow_xpm);
     wxBitmap TextTool(texttool_xpm);
     wxSize toolBitmapSize(22, 22);

diff --git a/contrib/samples/ogl/studio/studio.cpp b/contrib/samples/ogl/studio/studio.cpp
index 77be7684a8f4e4a3c280fb200bd0baa5ee9b410e..14ca6ba54e37c20899dcfbaba8017442350ffe81 100644 (file)
--- a/contrib/samples/ogl/studio/studio.cpp
+++ b/contrib/samples/ogl/studio/studio.cpp
@@ -33,7 +33,7 @@
 #include "project.h"
 #include "symbols.h"
 
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
 #include "bitmaps/new.xpm"
 #include "bitmaps/open.xpm"
 #include "bitmaps/save.xpm"
@@ -322,7 +322,7 @@ void csApp::InitToolBar(wxToolBar* toolBar)
     bitmaps[7] = new wxBitmap("help", wxBITMAP_TYPE_RESOURCE);
     bitmaps[8] = new wxBitmap("undo", wxBITMAP_TYPE_RESOURCE);
     bitmaps[9] = new wxBitmap("redo", wxBITMAP_TYPE_RESOURCE);
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     bitmaps[0] = new wxBitmap( new_xpm );
     bitmaps[1] = new wxBitmap( open_xpm );
     bitmaps[2] = new wxBitmap( save_xpm );
@@ -395,7 +395,7 @@ void csApp::CreateDiagramToolBar(wxFrame* parent)
     bitmaps[8] = new wxBitmap("newpoint", wxBITMAP_TYPE_RESOURCE);
     bitmaps[9] = new wxBitmap("cutpoint", wxBITMAP_TYPE_RESOURCE);
     bitmaps[10] = new wxBitmap("straighten", wxBITMAP_TYPE_RESOURCE);
-#elif defined(__WXGTK__) || defined(__WXMOTIF__)
+#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
     bitmaps[0] = new wxBitmap( alignl_xpm );
     bitmaps[1] = new wxBitmap( alignr_xpm );
     bitmaps[2] = new wxBitmap( alignt_xpm );