#include "wx/log.h"
#include "wx/intl.h"
#include "wx/evtloop.h"
+#include "wx/cmdline.h"
#if wxUSE_THREADS
#include "wx/thread.h"
#include <string.h>
-extern char *wxBuffer;
extern wxList wxPendingDelete;
wxApp *wxTheApp = 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
delete wxTheApp;
wxTheApp = NULL;
- delete[] wxBuffer;
- wxBuffer = NULL;
-
wxClassInfo::CleanUpClasses();
#if wxUSE_THREADS
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[] )
{
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
#endif // __WXDEBUG__
+ /// TODO
+#if 0
+ // Parse the arguments.
+#endif
+
Display* xdisplay = XOpenDisplay(NULL);
if (!xdisplay)
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();
win = wxGetWindowFromTable(window);
if (!win)
- return;
+ return;
switch (event->type)
{
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);;
{
if (win)
{
+ // Schedule update for later
win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
event->xexpose.width, event->xexpose.height);
- if (event->xexpose.count == 0)
- {
- win->X11SendPaintEvents(); // TODO let an idle handler do that
- }
}
return;
}
default:
{
+#ifdef __WXDEBUG__
+ //wxString eventName = wxGetXEventName(XEvent& event);
+ //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+#endif
break;
}
}
void wxApp::OnIdle(wxIdleEvent& event)
{
- static bool inOnIdle = FALSE;
+ static bool s_inOnIdle = FALSE;
// Avoid recursion (via ProcessEvent default case)
- if (inOnIdle)
+ if (s_inOnIdle)
return;
- inOnIdle = TRUE;
-
- // If there are pending events, we must process them: pending events
- // are either events to the threads other than main or events posted
- // with wxPostEvent() functions
- // GRG: I have moved this here so that all pending events are processed
- // before starting to delete any objects. This behaves better (in
- // particular, wrt wxPostEvent) and is coherent with wxGTK's current
- // behaviour. Also removed the '#if wxUSE_THREADS' around it.
- // Changed Mar/2000 before 2.1.14
+ s_inOnIdle = TRUE;
- // Flush pending events.
+ // Resend in the main thread events which have been prepared in other
+ // threads
ProcessPendingEvents();
- // 'Garbage' collection of windows deleted with Close().
+ // 'Garbage' collection of windows deleted with Close()
DeletePendingObjects();
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
// Send OnIdle events to all windows
bool needMore = SendIdleEvents();
if (needMore)
event.RequestMore(TRUE);
- inOnIdle = FALSE;
+ s_inOnIdle = FALSE;
}
void wxWakeUpIdle()
wxIdleEvent event;
event.SetEventObject(win);
- win->ProcessEvent(event);
+
+ win->GetEventHandler()->ProcessEvent(event);
+
+ win->OnInternalIdle();
if (event.MoreRequested())
needMore = TRUE;
node = node->Next();
}
- return needMore ;
+
+ return needMore;
}
void wxApp::DeletePendingObjects()
Window wxGetWindowParent(Window window)
{
+ wxASSERT_MSG( window, "invalid window" );
+
+ return (Window) 0;
+
Window parent, root = 0;
unsigned int noChildren = 0;
Window* children = NULL;
#endif
}
-// ----------------------------------------------------------------------------
-// accessors for C modules
-// ----------------------------------------------------------------------------
-
-#if 0
-extern "C" XtAppContext wxGetAppContext()
-{
- return (XtAppContext)wxTheApp->GetAppContext();
-}
-#endif