More Motif additions: mdi and sashtest samples now just about work!

[wxWidgets.git] / src / motif / app.cpp

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index df82c80919f1de7fa92a42fd97389a5b4bebcb43..94e652a549e893a503a77db586c21463b5ed71d1 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -33,10 +33,6 @@
 #include "wx/resource.h"
 #endif
 
 #include "wx/resource.h"
 #endif
 

-#if wxUSE_POSTSCRIPT
-#include "wx/postscrp.h"
-#endif
-

 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <Xm/Xm.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>


@@ -91,9 +87,11 @@ bool wxApp::Initialize()
 
   // For PostScript printing
 #if wxUSE_POSTSCRIPT
 
   // For PostScript printing
 #if wxUSE_POSTSCRIPT

+/* Done using wxModule now

     wxInitializePrintSetupData();
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();
     wxInitializePrintSetupData();
     wxThePrintPaperDatabase = new wxPrintPaperDatabase;
     wxThePrintPaperDatabase->CreateDatabase();

+*/

 #endif
 
     wxBitmap::InitStandardHandlers();
 #endif
 
     wxBitmap::InitStandardHandlers();


@@ -137,9 +135,11 @@ void wxApp::CleanUp()
     wxTheColourDatabase = NULL;
 
 #if wxUSE_POSTSCRIPT
     wxTheColourDatabase = NULL;
 
 #if wxUSE_POSTSCRIPT

+/* Done using wxModule now

     wxInitializePrintSetupData(FALSE);
     delete wxThePrintPaperDatabase;
     wxThePrintPaperDatabase = NULL;
     wxInitializePrintSetupData(FALSE);
     delete wxThePrintPaperDatabase;
     wxThePrintPaperDatabase = NULL;

+*/

 #endif
 
     wxBitmap::CleanUpHandlers();
 #endif
 
     wxBitmap::CleanUpHandlers();


@@ -247,6 +247,7 @@ wxApp::wxApp()
     m_appContext = (WXAppContext) NULL;
     m_topLevelWidget = (WXWidget) NULL;
     m_maxRequestSize = 0;
     m_appContext = (WXAppContext) NULL;
     m_topLevelWidget = (WXWidget) NULL;
     m_maxRequestSize = 0;

+    m_initialDisplay = (WXDisplay*) 0;

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -460,6 +461,8 @@ bool wxApp::OnInitGui()
       cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
       exit(-1);
     }
       cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
       exit(-1);
     }

+    m_initialDisplay = (WXDisplay*) dpy;
+

     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
                                      applicationShellWidgetClass,dpy,
                                      NULL,0) ;
     wxTheApp->m_topLevelWidget = (WXWidget) XtAppCreateShell((String)NULL, (const char*) wxTheApp->GetClassName(),
                                      applicationShellWidgetClass,dpy,
                                      NULL,0) ;