Various wxMotif changes including size optimisation and debugging operator fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "wx/date.h"
|
||||
|
||||
#ifdef __WXGTK__
|
||||
#if defined(__WXGTK__) || defined(__WXMOTIF__)
|
||||
#include "mondrian.xpm"
|
||||
#endif
|
||||
|
||||
@@ -35,6 +35,12 @@
|
||||
#error This program must be compiled in debug mode.
|
||||
#endif
|
||||
|
||||
// Normally, new is automatically defined to be the
|
||||
// debugging version. If not, this does it.
|
||||
#if !defined(new) && defined(WXDEBUG_NEW)
|
||||
#define new WXDEBUG_NEW
|
||||
#endif
|
||||
|
||||
// Define a new application type
|
||||
class MyApp: public wxApp
|
||||
{ public:
|
||||
@@ -59,11 +65,7 @@ bool MyApp::OnInit(void)
|
||||
MyFrame *frame = new MyFrame((wxFrame *) NULL);
|
||||
|
||||
// Give it an icon
|
||||
#ifdef __WXMSW__
|
||||
frame->SetIcon(wxIcon("mondrian"));
|
||||
#else
|
||||
frame->SetIcon(wxIcon(mondrian_xpm));
|
||||
#endif
|
||||
frame->SetIcon(wxICON(mondrian));
|
||||
|
||||
// Make a menubar
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
@@ -82,7 +84,6 @@ bool MyApp::OnInit(void)
|
||||
frame->Show(TRUE);
|
||||
|
||||
wxDebugContext::SetCheckpoint();
|
||||
// wxDebugContext::SetFile("debug.log");
|
||||
|
||||
wxString *thing = new wxString;
|
||||
wxDate* date = new wxDate;
|
||||
|
Reference in New Issue
Block a user