projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made all bitmaps 16x16
[wxWidgets.git]
/
src
/
mgl
/
app.cpp
diff --git
a/src/mgl/app.cpp
b/src/mgl/app.cpp
index 97786a24baa36aa95059e2af5c0a4f26da35bcf3..53c61fad168072b3ccb2a0abf70686aa7a39051d 100644
(file)
--- a/
src/mgl/app.cpp
+++ b/
src/mgl/app.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name:
src/mgl/
app.cpp
// Author: Vaclav Slavik
// based on GTK and MSW implementations
// Id: $Id$
// Author: Vaclav Slavik
// based on GTK and MSW implementations
// Id: $Id$
@@
-14,6
+14,7
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#include "wx/app.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
#ifndef WX_PRECOMP
#include "wx/settings.h"
@@
-21,11
+22,10
@@
#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/dialog.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/module.h"
#endif
#endif
-#include "wx/app.h"
#include "wx/evtloop.h"
#include "wx/evtloop.h"
-#include "wx/module.h"
#include "wx/fontutil.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
#include "wx/fontutil.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
@@
-124,7
+124,7
@@
class wxRootWindow : public wxWindow
SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
}
SetMGLwindow_t(MGL_wmGetRootWindow(g_winMng));
SetBackgroundColour(wxTHEME_COLOUR(DESKTOP));
}
- ~wxRootWindow()
+
virtual
~wxRootWindow()
{
// we don't want to delete MGL_WM's rootWnd
m_wnd = NULL;
{
// we don't want to delete MGL_WM's rootWnd
m_wnd = NULL;
@@
-329,4
+329,3
@@
void wxApp::CleanUp()
wxModule::RegisterModule(new wxMGLFinalCleanup);
}
wxModule::RegisterModule(new wxMGLFinalCleanup);
}
-