first pass of wxUniv merge - nothing works, most parts don't even compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -309,11 +309,6 @@ END_EVENT_TABLE()
|
||||
|
||||
wxApp::wxApp()
|
||||
{
|
||||
wxTheApp = this;
|
||||
|
||||
m_topWindow = (wxWindow *) NULL;
|
||||
m_exitOnFrameDelete = TRUE;
|
||||
|
||||
m_idleTag = 0;
|
||||
wxapp_install_idle_handler();
|
||||
|
||||
@@ -323,8 +318,6 @@ wxApp::wxApp()
|
||||
#endif
|
||||
|
||||
m_colorCube = (unsigned char*) NULL;
|
||||
|
||||
m_useBestVisual = FALSE;
|
||||
}
|
||||
|
||||
wxApp::~wxApp()
|
||||
@@ -340,6 +333,9 @@ wxApp::~wxApp()
|
||||
|
||||
bool wxApp::OnInitGui()
|
||||
{
|
||||
if ( !wxAppBase::OnInitGui() )
|
||||
return FALSE;
|
||||
|
||||
GdkVisual *visual = gdk_visual_get_system();
|
||||
|
||||
/* on some machines, the default visual is just 256 colours, so
|
||||
|
Reference in New Issue
Block a user