corrections for Mac OS X compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -24,7 +24,7 @@
|
|||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||||
#include "bombs.xpm"
|
#include "bombs.xpm"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include "wxpoem.h"
|
#include "wxpoem.h"
|
||||||
|
|
||||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||||
#include "corner1.xpm"
|
#include "corner1.xpm"
|
||||||
#include "corner2.xpm"
|
#include "corner2.xpm"
|
||||||
#include "corner3.xpm"
|
#include "corner3.xpm"
|
||||||
@@ -236,7 +236,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
|
|||||||
while (ch != 0 && !page_break)
|
while (ch != 0 && !page_break)
|
||||||
{
|
{
|
||||||
j = 0;
|
j = 0;
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||||
while (((ch = poem_buffer[i]) != 13) && (ch != 0))
|
while (((ch = poem_buffer[i]) != 13) && (ch != 0))
|
||||||
#else
|
#else
|
||||||
while (((ch = poem_buffer[i]) != 10) && (ch != 0))
|
while (((ch = poem_buffer[i]) != 10) && (ch != 0))
|
||||||
@@ -247,7 +247,7 @@ void MainWindow::ScanBuffer(wxDC *dc, bool DrawIt, int *max_x, int *max_y)
|
|||||||
i ++;
|
i ++;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __WXMSW__
|
#if defined(__WXMSW__) || defined(__WXMAC__)
|
||||||
if (ch == 13)
|
if (ch == 13)
|
||||||
#else
|
#else
|
||||||
if (ch == 10)
|
if (ch == 10)
|
||||||
@@ -650,7 +650,7 @@ bool MyApp::OnInit()
|
|||||||
Corner3 = new wxIcon("icon_3");
|
Corner3 = new wxIcon("icon_3");
|
||||||
Corner4 = new wxIcon("icon_4");
|
Corner4 = new wxIcon("icon_4");
|
||||||
#endif
|
#endif
|
||||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
#if defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||||
Corner1 = new wxIcon( corner1_xpm );
|
Corner1 = new wxIcon( corner1_xpm );
|
||||||
Corner2 = new wxIcon( corner2_xpm );
|
Corner2 = new wxIcon( corner2_xpm );
|
||||||
Corner3 = new wxIcon( corner3_xpm );
|
Corner3 = new wxIcon( corner3_xpm );
|
||||||
|
Reference in New Issue
Block a user