/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
#endif
#include "wx/frame.h"
#include "wx/log.h"
#include "wx/module.h"
#include "wx/memory.h"
+#include "wx/log.h"
+#include "wx/intl.h"
#if wxUSE_THREADS
-#include "wx/thread.h"
+ #include "wx/thread.h"
#endif
#if wxUSE_WX_RESOURCES
extern char *wxBuffer;
extern wxList wxPendingDelete;
-#if wxUSE_THREADS
-extern wxList wxPendingEvents;
-extern wxList wxPendingEventsLocker;
-#endif
wxApp *wxTheApp = NULL;
wxClassInfo::InitializeClasses();
+ // GL: I'm annoyed ... I don't know where to put this and I don't want to
+ // create a module for that as it's part of the core.
+#if wxUSE_THREADS
+ wxPendingEventsLocker = new wxCriticalSection();
+#endif
+
wxTheColourDatabase = new wxColourDatabase(wxKEY_STRING);
wxTheColourDatabase->Initialize();
delete wxTheApp;
wxTheApp = NULL;
+ // GL: I'm annoyed ... I don't know where to put this and I don't want to
+ // create a module for that as it's part of the core.
+#if wxUSE_THREADS
+ delete wxPendingEvents;
+ delete wxPendingEventsLocker;
+#endif
+
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
// At this point we want to check if there are any memory
// blocks that aren't part of the wxDebugContext itself,
};
// Static member initialization
-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;
wxApp::wxApp()
{
m_appName = "";
argc = 0;
argv = NULL;
- m_printMode = wxPRINT_POSTSCRIPT;
m_exitOnFrameDelete = TRUE;
- m_auto3D = TRUE;
m_mainColormap = (WXColormap) NULL;
m_appContext = (WXAppContext) NULL;
{
XEvent* event = (XEvent*) _event;
- if ((event->type == KeyPress) && CheckForAccelerator(_event))
+ if (event->type == KeyPress)
{
- // Do nothing! We intercepted and processed the event as an accelerator.
- return;
+#ifdef __WXDEBUG__
+ Widget widget = XtWindowToWidget(event->xany.display, event->xany.window);
+ wxLogDebug("Got key press event for 0x%08x (parent = 0x%08x)",
+ widget, XtParent(widget));
+#endif // DEBUG
+
+ if (CheckForAccelerator(_event))
+ {
+ // Do nothing! We intercepted and processed the event as an
+ // accelerator.
+ return;
+ }
+#if 1
+ // It seemed before that this hack was redundant and
+ // key down events were being generated by wxCanvasInputEvent.
+ // But no longer - why ???
+ //
+ else if (CheckForKeyDown(_event))
+ {
+ // We intercepted and processed the key down event
+ return;
+ }
+#endif
+ else
+ {
+ XtDispatchEvent(event);
+ return;
+ }
+ }
+ else if (event->type == KeyRelease)
+ {
+ // TODO: work out why we still need this ! -michael
+ //
+ if (CheckForKeyUp(_event))
+ {
+ // We intercepted and processed the key up event
+ return;
+ }
+ else
+ {
+ XtDispatchEvent(event);
+ return;
+ }
}
else if (event->type == PropertyNotify)
{
}
else if (event->type == ResizeRequest)
{
- /* Terry Gitnick <terryg@scientech.com> - 1/21/98
- * If resize event, don't resize until the last resize event for this
- * window is recieved. Prevents flicker as windows are resized.
- */
+ /* Terry Gitnick <terryg@scientech.com> - 1/21/98
+ * If resize event, don't resize until the last resize event for this
+ * window is recieved. Prevents flicker as windows are resized.
+ */
Display *disp = XtDisplay((Widget) wxTheApp->GetTopLevelWidget());
Window win = event->xany.window;
inOnIdle = FALSE;
}
+void wxWakeUpIdle()
+{
+ // **** please implement me! ****
+ // Wake up the idle handler processor, even if it is in another thread...
+}
+
+
// Send idle event to all top-level windows
bool wxApp::SendIdleEvents()
{
}
}
-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-
- wxNode *node = wxPendingEvents.First();
- wxCriticalSectionLocker locker(wxPendingEventsLocker);
-
- while (node)
- {
- wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
- handler->ProcessPendingEvents();
-
- delete node;
- node = wxPendingEvents.First();
- }
-
-#endif
-
-wxLog* wxApp::CreateLogTarget()
-{
- return new wxLogGui;
-}
-
-wxWindow* wxApp::GetTopWindow() const
-{
- if (m_topWindow)
- return m_topWindow;
- else if (wxTopLevelWindows.GetCount() > 0)
- return wxTopLevelWindows.GetFirst()->GetData();
- else
- return NULL;
-}
-
// Create an application context
bool wxApp::OnInitGui()
{
return FALSE;
}
+bool wxApp::CheckForKeyDown(WXEvent* event)
+{
+ XEvent* xEvent = (XEvent*) event;
+ if (xEvent->xany.type == KeyPress)
+ {
+ Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+ xEvent->xany.window);
+ wxWindow* win = NULL;
+
+ // Find the first wxWindow that corresponds to this event window
+ while (widget && !(win = wxGetWindowFromTable(widget)))
+ widget = XtParent(widget);
+
+ if (!widget || !win)
+ return FALSE;
+
+ wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
+ wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+ return win->ProcessEvent( keyEvent );
+ }
+
+ return FALSE;
+}
+
+bool wxApp::CheckForKeyUp(WXEvent* event)
+{
+ XEvent* xEvent = (XEvent*) event;
+ if (xEvent->xany.type == KeyRelease)
+ {
+ Widget widget = XtWindowToWidget((Display*) wxGetDisplay(),
+ xEvent->xany.window);
+ wxWindow* win = NULL;
+
+ // Find the first wxWindow that corresponds to this event window
+ while (widget && !(win = wxGetWindowFromTable(widget)))
+ widget = XtParent(widget);
+
+ if (!widget || !win)
+ return FALSE;
+
+ wxKeyEvent keyEvent(wxEVT_KEY_UP);
+ wxTranslateKeyEvent(keyEvent, win, (Widget) 0, xEvent);
+
+ return win->ProcessEvent( keyEvent );
+ }
+
+ return FALSE;
+}
+
void wxExit()
{
int retValue = 0;
return TRUE;
}
+// TODO use XmGetPixmap (?) to get the really standard icons!
+
+#include "wx/generic/info.xpm"
+#include "wx/generic/error.xpm"
+#include "wx/generic/question.xpm"
+#include "wx/generic/warning.xpm"
+
+wxIcon
+wxApp::GetStdIcon(int which) const
+{
+ switch(which)
+ {
+ case wxICON_INFORMATION:
+ return wxIcon(info_xpm);
+
+ case wxICON_QUESTION:
+ return wxIcon(question_xpm);
+
+ case wxICON_EXCLAMATION:
+ return wxIcon(warning_xpm);
+
+ default:
+ wxFAIL_MSG("requested non existent standard icon");
+ // still fall through
+
+ case wxICON_HAND:
+ return wxIcon(error_xpm);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext()
+{
+ return (XtAppContext)wxTheApp->GetAppContext();
+}