Code cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -29,8 +29,8 @@
|
||||
#include "doc.h"
|
||||
#include "view.h"
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||
#include "ogl.xpm"
|
||||
#ifndef __WXMSW__
|
||||
#include "ogl.xpm"
|
||||
#endif
|
||||
|
||||
// A macro needed for some compilers (AIX) that need 'main' to be defined
|
||||
@@ -208,4 +208,3 @@ MyFrame *GetMainFrame(void)
|
||||
{
|
||||
return wxGetApp().frame;
|
||||
}
|
||||
|
||||
|
@@ -32,7 +32,7 @@
|
||||
#include "cspalette.h"
|
||||
#include "symbols.h"
|
||||
|
||||
#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||
#ifndef __WXMSW__
|
||||
#include "bitmaps/arrow.xpm"
|
||||
#include "bitmaps/texttool.xpm"
|
||||
#endif
|
||||
@@ -118,7 +118,7 @@ bool csApp::CreatePalette(wxFrame *parent)
|
||||
wxBitmap PaletteArrow(_T("arrowtool"));
|
||||
wxBitmap TextTool(_T("texttool"));
|
||||
wxSize toolBitmapSize(32, 32);
|
||||
#elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) || defined(__WXMAC__)
|
||||
#else // !__WXMSW__
|
||||
wxBitmap PaletteArrow(arrow_xpm);
|
||||
wxBitmap TextTool(texttool_xpm);
|
||||
wxSize toolBitmapSize(22, 22);
|
||||
@@ -141,7 +141,7 @@ bool csApp::CreatePalette(wxFrame *parent)
|
||||
|
||||
symbols[noSymbols] = _T("Thin Rectangle");
|
||||
noSymbols ++;
|
||||
|
||||
|
||||
symbols[noSymbols] = _T("Triangle");
|
||||
noSymbols ++;
|
||||
|
||||
@@ -200,4 +200,3 @@ bool csApp::CreatePalette(wxFrame *parent)
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user