Stopped width = 0 fouling up window size change

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

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 62cb336b789a4f0c5d9bf18a5dac9f65954d6b03..4d43a26b1726e7e58dd5dbfa26062c5758afb878 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -29,6 +29,7 @@
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/evtloop.h"
+#include "wx/cmdline.h"
 
 #if wxUSE_THREADS
     #include "wx/thread.h"
@@ -53,7 +54,6 @@
 
 #include <string.h>
 
-extern char *wxBuffer;
 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
@@ -83,8 +83,6 @@ WXDisplay *wxApp::ms_display = NULL;
 
 bool wxApp::Initialize()
 {
-    wxBuffer = new char[BUFSIZ + 512];
-
     wxClassInfo::InitializeClasses();
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
@@ -132,9 +130,6 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = NULL;
 
-    delete[] wxBuffer;
-    wxBuffer = NULL;
-
     wxClassInfo::CleanUpClasses();
 
 #if wxUSE_THREADS
@@ -161,6 +156,11 @@ void wxApp::CleanUp()
     delete wxLog::SetActiveTarget(NULL);
 }
 
+// This is set within wxEntryStart -- too early on
+// to put these in wxTheApp
+static int g_newArgc = 0;
+static wxChar** g_newArgv = NULL;
+
 // NB: argc and argv may be changed here, pass by reference!
 int wxEntryStart( int& argc, char *argv[] )
 {
@@ -169,6 +169,11 @@ int wxEntryStart( int& argc, char *argv[] )
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif // __WXDEBUG__
 
+    /// TODO
+#if 0
+    // Parse the arguments.
+#endif
+
     Display* xdisplay = XOpenDisplay(NULL);
 
     if (!xdisplay)
@@ -236,8 +241,18 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
 
-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
+    // The command line may have been changed
+    // by stripping out -display etc.
+    if (g_newArgc > 0)
+    {
+        wxTheApp->argc = g_newArgc;
+        wxTheApp->argv = g_newArgv;
+    }
+    else
+    {
+        wxTheApp->argc = argc;
+        wxTheApp->argv = argv;
+    }
 
     int retValue;
     retValue = wxEntryInitGui();
@@ -339,7 +354,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
     win = wxGetWindowFromTable(window);
     if (!win)
-       return;
+           return;
 
     switch (event->type)
     {
@@ -388,7 +403,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             return;
         }
         case ClientMessage:
-        {           
+        {
+            if (win && !win->IsEnabled())
+                return;
+
             Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
             Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
 
@@ -498,6 +516,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
         default:
         {
+#ifdef __WXDEBUG__
+            //wxString eventName = wxGetXEventName(XEvent& event);
+            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+#endif
             break;
         }
     }
@@ -674,6 +696,10 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
+    wxASSERT_MSG( window, "invalid window" );
+    
+    return (Window) 0;
+
     Window parent, root = 0;
     unsigned int noChildren = 0;
     Window* children = NULL;
@@ -775,13 +801,3 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
-// ----------------------------------------------------------------------------
-// accessors for C modules
-// ----------------------------------------------------------------------------
-
-#if 0
-extern "C" XtAppContext wxGetAppContext()
-{
-    return (XtAppContext)wxTheApp->GetAppContext();
-}
-#endif