AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

corrections for wxMac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot 2002-01-13 17:37:23 +00:00
parent adb1282e8e
commit 8cdb648efa
10 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/include/wx/applet/applet.h
View File

@ -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;

2
contrib/include/wx/applet/window.h
View File

@ -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;

1
contrib/samples/gizmos/dynsash/dynsash.cpp
View File

@ -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>

1
contrib/samples/gizmos/dynsash_switch/dynsash_switch.cpp
View File

@ -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>

2
contrib/samples/gizmos/splittree/tree.cpp
View File

@ -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

2
contrib/samples/mmedia/mmboard.cpp
View File

@ -37,7 +37,7 @@
// ressources
// ----------------------------------------------------------------------------
// the application icon
#if defined(__WXGTK__) || defined(__WXMOTIF__)
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
#include "mondrian.xpm"
#endif

2
contrib/samples/ogl/ogledit/ogledit.cpp
View File

@ -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

4
contrib/samples/ogl/ogledit/palette.cpp
View File

@ -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);

4
contrib/samples/ogl/studio/cspalette.cpp
View File

@ -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);

6
contrib/samples/ogl/studio/studio.cpp
View File

@ -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 );