/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "app.h"
+ #pragma implementation "app.h"
+ #pragma implementation "appbase.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
-#include "wx/resource.h"
+ #include "wx/resource.h"
#endif
#include <Xm/Xm.h>
extern char *wxBuffer;
extern wxList wxPendingDelete;
+#if wxUSE_THREADS
+extern wxList *wxPendingEvents;
+extern wxCriticalSection *wxPendingEventsLocker;
+#endif // wxUSE_THREADS
+
wxApp *wxTheApp = NULL;
wxHashTable *wxWidgetHashTable = NULL;
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
+
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
-EVT_IDLE(wxApp::OnIdle)
+ EVT_IDLE(wxApp::OnIdle)
END_EVENT_TABLE()
#endif
bool wxApp::Initialize()
{
-#ifdef __WXMSW__
- wxBuffer = new char[1500];
-#else
wxBuffer = new char[BUFSIZ + 512];
-#endif
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
+ wxPendingEvents = new wxList();
+ 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,
// GUI-specific initialization, such as creating an app context.
wxTheApp->OnInitGui();
- // Here frames insert themselves automatically
- // into wxTopLevelWindows by getting created
- // in OnInit().
+ // Here frames insert themselves automatically into wxTopLevelWindows by
+ // getting created in OnInit().
int retValue = 0;
if (wxTheApp->OnInit())
};
// 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;
{
if (!ProcessIdle())
{
+#if wxUSE_THREADS
// leave the main loop to give other threads a chance to
// perform their GUI work
wxMutexGuiLeave();
wxUsleep(20);
wxMutexGuiEnter();
+#endif
}
}
{
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.
+ if (CheckForAccelerator(_event))
+ {
+ // Do nothing! We intercepted and processed the event as an
+ // accelerator.
+ return;
+ }
+ else if (CheckForKeyDown(_event))
+ {
+ // We intercepted and processed the key down 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;
// 'Garbage' collection of windows deleted with Close().
DeletePendingObjects();
+#if wxUSE_THREADS
+ // Flush pending events.
+ ProcessPendingEvents();
+#endif
+
// flush the logged messages if any
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL && pLog->HasPendingMessages() )
bool wxApp::SendIdleEvents()
{
bool needMore = FALSE;
- wxNode* node = wxTopLevelWindows.First();
+
+ wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
while (node)
{
- wxWindow* win = (wxWindow*) node->Data();
+ wxWindow* win = node->GetData();
if (SendIdleEvents(win))
needMore = TRUE;
-
- node = node->Next();
+ node = node->GetNext();
}
+
return needMore;
}
}
}
-wxLog* wxApp::CreateLogTarget()
+#if wxUSE_THREADS
+void wxApp::ProcessPendingEvents()
{
- return new wxLogGui;
-}
+ wxNode *node = wxPendingEvents->First();
+ wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-wxWindow* wxApp::GetTopWindow() const
-{
- if (m_topWindow)
- return m_topWindow;
- else if (wxTopLevelWindows.Number() > 0)
- return (wxWindow*) wxTopLevelWindows.First()->Data();
- else
- return NULL;
+ while (node)
+ {
+ wxEvtHandler *handler = (wxEvtHandler *)node->Data();
+
+ handler->ProcessPendingEvents();
+
+ delete node;
+ node = wxPendingEvents->First();
+ }
}
+#endif // wxUSE_THREADS
// Create an application context
bool wxApp::OnInitGui()
XtToolkitInitialize() ;
wxTheApp->m_appContext = (WXAppContext) XtCreateApplicationContext() ;
Display *dpy = XtOpenDisplay((XtAppContext) wxTheApp->m_appContext,(String)NULL,NULL,
- (const char*) wxTheApp->GetClassName(), NULL,
+ (const char*) wxTheApp->GetClassName(), NULL, 0,
# if XtSpecificationRelease < 5
- 0,(Cardinal*) &argc,argv) ;
+ (Cardinal*) &argc,
# else
- 0,&argc,argv) ;
+ &argc,
# endif
+ argv);
+
if (!dpy) {
- cerr << "wxWindows could not open display for " << wxTheApp->GetClassName() << ": exiting.\n";
+ wxString className(wxTheApp->GetClassName());
+ wxLogError(_("wxWindows could not open display for '%s': exiting."),
+ (const char*) className);
exit(-1);
}
m_initialDisplay = (WXDisplay*) dpy;
return FALSE;
}
+bool wxApp::CheckForKeyDown(WXEvent* event)
+{
+ XEvent* xEvent = (XEvent*) event;
+ // VZ: this code doesn't work for me because it never finds the correct
+ // window. Also, if we go this way, we should generate KEY_UP and
+ // CHAR events as well, not only KEY_DOWN.
+#if 0
+ 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);
+
+ win->ProcessEvent( keyEvent );
+ return (keyEvent.GetSkipped() != TRUE);
+ }
+#endif // 0
+
+ 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);
+ }
+}
projects / wxWidgets.git / blobdiff