// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "app.h"
#endif
extern wxList wxPendingDelete;
-wxHashTable *wxWidgetHashTable = NULL;
-wxHashTable *wxClientWidgetHashTable = NULL;
+wxWindowHash *wxWidgetHashTable = NULL;
+wxWindowHash *wxClientWidgetHashTable = NULL;
-// This is set within wxEntryStart -- too early on
-// to put these in wxTheApp
static bool g_showIconic = FALSE;
static wxSize g_initialSize = wxDefaultSize;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
+ EVT_IDLE(wxAppBase::OnIdle)
END_EVENT_TABLE()
-bool wxApp::Initialize(int argc, wxChar **argv)
+bool wxApp::Initialize(int& argc, wxChar **argv)
{
- if ( !wxAppBase::Initialize(argc, argv) )
- return false;
-
-#if wxUSE_INTL
- wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
-#endif
-
- wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
-
- return true;
-}
-
-void wxApp::CleanUp()
-{
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
- delete wxClientWidgetHashTable;
- wxClientWidgetHashTable = NULL;
-
- wxAppBase::CleanUp();
-}
-
-// NB: argc and argv may be changed here, pass by reference!
-int wxEntryStart( int& argc, char *argv[] )
-{
-#ifdef __WXDEBUG__
-#if !wxUSE_NANOX
+#if defined(__WXDEBUG__) && !wxUSE_NANOX
// install the X error handler
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
-#endif
#endif // __WXDEBUG__
- char *displayName = NULL;
+ wxString displayName;
bool syncDisplay = FALSE;
- int i;
- for (i = 0; i < argc; i++)
+ int argcOrig = argc;
+ for ( int i = 0; i < argcOrig; i++ )
{
- if (strcmp( argv[i], "-display") == 0)
+ if (wxStrcmp( argv[i], _T("-display") ) == 0)
{
if (i < (argc - 1))
{
- i ++;
+ argv[i++] = NULL;
+
displayName = argv[i];
- continue;
+
+ argv[i] = NULL;
+ argc -= 2;
}
}
- else if (strcmp( argv[i], "-geometry") == 0)
+ else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)
{
if (i < (argc - 1))
{
- i ++;
+ argv[i++] = NULL;
+
int w, h;
- if (sscanf(argv[i], "%dx%d", &w, &h) != 2)
+ if (wxSscanf(argv[i], _T("%dx%d"), &w, &h) != 2)
{
- wxLogError( _("Invalid geometry specification '%s'"), wxString::FromAscii(argv[i]).c_str() );
+ wxLogError( _("Invalid geometry specification '%s'"),
+ wxString(argv[i]).c_str() );
}
else
{
g_initialSize = wxSize(w, h);
}
- continue;
+
+ argv[i] = NULL;
+ argc -= 2;
}
}
- else if (strcmp( argv[i], "-sync") == 0)
+ else if (wxStrcmp( argv[i], _T("-sync") ) == 0)
{
syncDisplay = TRUE;
- continue;
+
+ argv[i] = NULL;
+ argc--;
}
- else if (strcmp( argv[i], "-iconic") == 0)
+ else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)
{
g_showIconic = TRUE;
- continue;
+ argv[i] = NULL;
+ argc--;
}
+ }
+ if ( argc != argcOrig )
+ {
+ // remove the argumens we consumed
+ for ( int i = 0; i < argc; i++ )
+ {
+ while ( !argv[i] )
+ {
+ memmove(argv + i, argv + i + 1, argcOrig - i);
+ }
+ }
}
// X11 display stuff
- Display* xdisplay = XOpenDisplay( displayName );
+ Display *xdisplay;
+ if ( displayName.empty() )
+ xdisplay = XOpenDisplay( NULL );
+ else
+ xdisplay = XOpenDisplay( displayName.ToAscii() );
if (!xdisplay)
{
- wxLogError( _("wxWindows could not open display. Exiting.") );
- return -1;
+ wxLogError( _("wxWidgets could not open display. Exiting.") );
+ return false;
}
if (syncDisplay)
XSynchronize(xdisplay, True);
- wxApp::ms_display = (WXDisplay*) xdisplay;
+ ms_display = (WXDisplay*) xdisplay;
XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
// Misc.
wxSetDetectableAutoRepeat( TRUE );
-#if wxUSE_UNICODE
- // Glib's type system required by Pango
- g_type_init();
-#endif
-
- if (!wxApp::Initialize())
- return -1;
-
- return 0;
-}
-
-int wxEntryInitGui()
-{
- int retValue = 0;
-
- if ( !wxTheApp->OnInitGui() )
- retValue = -1;
-
- return retValue;
-}
-
-
-int wxEntry( int argc, char *argv[] )
-{
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
- // This seems to be necessary since there are 'rogue'
- // objects present at this point (perhaps global objects?)
- // Setting a checkpoint will ignore them as far as the
- // memory checking facility is concerned.
- // Of course you may argue that memory allocated in globals should be
- // checked, but this is a reasonable compromise.
- wxDebugContext::SetCheckpoint();
-#endif
- int err = wxEntryStart(argc, argv);
- if (err)
- return err;
-
- if (!wxTheApp)
+ if ( !wxAppBase::Initialize(argc, argv) )
{
- if (!wxApp::GetInitializerFunction())
- {
- printf( "wxWindows error: No initializer - use IMPLEMENT_APP macro.\n" );
- return 0;
- }
+ XCloseDisplay(xdisplay);
- wxTheApp = (wxApp*) (* wxApp::GetInitializerFunction()) ();
- }
-
- if (!wxTheApp)
- {
- printf( "wxWindows error: wxTheApp == NULL\n" );
- return 0;
+ return false;
}
- // Command line argument stuff
- wxTheApp->argc = argc;
#if wxUSE_UNICODE
- wxTheApp->argv = new wxChar*[argc+1];
- int mb_argc = 0;
- while (mb_argc < argc)
- {
- wxString tmp = wxString::FromAscii( argv[mb_argc] );
- wxTheApp->argv[mb_argc] = wxStrdup( tmp.c_str() );
- mb_argc++;
- }
- wxTheApp->argv[mb_argc] = (wxChar *)NULL;
-#else
- wxTheApp->argv = argv;
+ // Glib's type system required by Pango
+ g_type_init();
#endif
- if (wxTheApp->argc > 0)
- {
- wxFileName fname( wxTheApp->argv[0] );
- wxTheApp->SetAppName( fname.GetName() );
- }
-
- wxTheApp->m_showIconic = g_showIconic;
- wxTheApp->m_initialSize = g_initialSize;
-
- int retValue;
- retValue = wxEntryInitGui();
-
- // Here frames insert themselves automatically into wxTopLevelWindows by
- // getting created in OnInit().
- if ( retValue == 0 )
- {
- if ( !wxTheApp->OnInit() )
- retValue = -1;
- }
-
- if ( retValue == 0 )
- {
- if (wxTheApp->Initialized()) retValue = wxTheApp->OnRun();
- }
-
- // flush the logged messages if any
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->HasPendingMessages() )
- pLog->Flush();
-
- delete wxLog::SetActiveTarget(new wxLogStderr); // So dialog boxes aren't used
- // for further messages
-
- if (wxTheApp->GetTopWindow())
- {
- delete wxTheApp->GetTopWindow();
- wxTheApp->SetTopWindow(NULL);
- }
+#if wxUSE_INTL
+ wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
+#endif
- wxTheApp->DeletePendingObjects();
+ wxWidgetHashTable = new wxWindowHash;
+ wxClientWidgetHashTable = new wxWindowHash;
- wxTheApp->OnExit();
+ return true;
+}
- wxApp::CleanUp();
+void wxApp::CleanUp()
+{
+ delete wxWidgetHashTable;
+ wxWidgetHashTable = NULL;
+ delete wxClientWidgetHashTable;
+ wxClientWidgetHashTable = NULL;
- return retValue;
-};
+ wxAppBase::CleanUp();
+}
wxApp::wxApp()
{
m_mainColormap = (WXColormap) NULL;
m_topLevelWidget = (WXWindow) NULL;
m_maxRequestSize = 0;
- m_mainLoop = NULL;
m_showIconic = FALSE;
m_initialSize = wxDefaultSize;
#endif
}
-bool wxApp::Initialized()
-{
- if (GetTopWindow())
- return TRUE;
- else
- return FALSE;
-}
-
-int wxApp::MainLoop()
-{
- int rt;
- m_mainLoop = new wxEventLoop;
-
- rt = m_mainLoop->Run();
-
- delete m_mainLoop;
- m_mainLoop = NULL;
- return rt;
-}
-
#if !wxUSE_NANOX
//-----------------------------------------------------------------------
// X11 predicate function for exposure compression
#if !wxUSE_NANOX
case GraphicsExpose:
{
- printf( "GraphicExpose event\n" );
-
wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
if (event->update.utype == GR_UPDATE_SIZE)
#endif
{
- if (win->IsTopLevel())
+ wxTopLevelWindow *tlw = wxDynamicCast(win, wxTopLevelWindow);
+ if ( tlw )
{
- wxTopLevelWindow *tlw = (wxTopLevelWindow*) win;
tlw->SetConfigureGeometry( XConfigureEventGetX(event), XConfigureEventGetY(event),
XConfigureEventGetWidth(event), XConfigureEventGetHeight(event) );
}
- if (win->IsTopLevel() && win->IsShown())
+ if ( tlw && tlw->IsShown() )
{
- wxTopLevelWindowX11 *tlw = (wxTopLevelWindowX11 *) win;
tlw->SetNeedResizeInIdle();
}
else
}
}
return FALSE;
- break;
}
#if !wxUSE_NANOX
case PropertyNotify:
return win->GetEventHandler()->ProcessEvent( wxevent );
}
case FocusIn:
- {
#if !wxUSE_NANOX
- if ((event->xfocus.detail != NotifyPointer) &&
- (event->xfocus.mode == NotifyNormal))
+ if ((event->xfocus.detail != NotifyPointer) &&
+ (event->xfocus.mode == NotifyNormal))
#endif
+ {
+ wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+
+ extern wxWindow* g_GettingFocus;
+ if (g_GettingFocus && g_GettingFocus->GetParent() == win)
{
- wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ // Ignore this, this can be a spurious FocusIn
+ // caused by a child having its focus set.
+ g_GettingFocus = NULL;
+ wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ return TRUE;
+ }
+ else
+ {
+ wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
+ focusEvent.SetEventObject(win);
+ focusEvent.SetWindow( g_prevFocus );
+ g_prevFocus = NULL;
- extern wxWindow* g_GettingFocus;
- if (g_GettingFocus && g_GettingFocus->GetParent() == win)
- {
- // Ignore this, this can be a spurious FocusIn
- // caused by a child having its focus set.
- g_GettingFocus = NULL;
- wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
- return TRUE;
- }
- else
- {
- wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
- focusEvent.SetEventObject(win);
- focusEvent.SetWindow( g_prevFocus );
- g_prevFocus = NULL;
-
- return win->GetEventHandler()->ProcessEvent(focusEvent);
- }
+ return win->GetEventHandler()->ProcessEvent(focusEvent);
}
- return FALSE;
- break;
}
+ return FALSE;
+
case FocusOut:
- {
#if !wxUSE_NANOX
- if ((event->xfocus.detail != NotifyPointer) &&
- (event->xfocus.mode == NotifyNormal))
+ if ((event->xfocus.detail != NotifyPointer) &&
+ (event->xfocus.mode == NotifyNormal))
#endif
- {
- wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ {
+ wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
- wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
- focusEvent.SetEventObject(win);
- focusEvent.SetWindow( g_nextFocus );
- g_nextFocus = NULL;
- return win->GetEventHandler()->ProcessEvent(focusEvent);
- }
- return FALSE;
- break;
+ wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
+ focusEvent.SetEventObject(win);
+ focusEvent.SetWindow( g_nextFocus );
+ g_nextFocus = NULL;
+ return win->GetEventHandler()->ProcessEvent(focusEvent);
}
- default:
- {
+ return FALSE;
+
#ifdef __WXDEBUG__
+ default:
//wxString eventName = wxGetXEventName(XEvent& event);
//wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
-#endif
- return FALSE;
break;
- }
+#endif // __WXDEBUG__
}
- return FALSE;
-}
-
-// Returns TRUE if more time is needed.
-// Note that this duplicates wxEventLoopImpl::SendIdleEvent
-// but ProcessIdle may be needed by apps, so is kept.
-bool wxApp::ProcessIdle()
-{
- wxIdleEvent event;
- event.SetEventObject(this);
- ProcessEvent(event);
-
- return event.MoreRequested();
-}
-
-void wxApp::ExitMainLoop()
-{
- if (m_mainLoop)
- m_mainLoop->Exit(0);
-}
-
-// Is a message/event pending?
-bool wxApp::Pending()
-{
- return wxEventLoop::GetActive()->Pending();
-}
-// Dispatch a message.
-void wxApp::Dispatch()
-{
- wxEventLoop::GetActive()->Dispatch();
+ return FALSE;
}
// This should be redefined in a derived class for
return FALSE;
}
-void wxApp::OnIdle(wxIdleEvent& event)
-{
- static bool s_inOnIdle = FALSE;
-
- // Avoid recursion (via ProcessEvent default case)
- if (s_inOnIdle)
- return;
-
- s_inOnIdle = TRUE;
-
- // Resend in the main thread events which have been prepared in other
- // threads
- ProcessPendingEvents();
-
- // 'Garbage' collection of windows deleted with Close()
- DeletePendingObjects();
-
- // Send OnIdle events to all windows
- bool needMore = SendIdleEvents();
-
- if (needMore)
- event.RequestMore(TRUE);
-
- s_inOnIdle = FALSE;
-}
-
void wxApp::WakeUpIdle()
{
// TODO: use wxMotif implementation?
}
-// Send idle event to all top-level windows
-bool wxApp::SendIdleEvents()
-{
- bool needMore = FALSE;
-
- wxWindowList::Node* node = wxTopLevelWindows.GetFirst();
- while (node)
- {
- wxWindow* win = node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
- node = node->GetNext();
- }
-
- return needMore;
-}
-
-// Send idle event to window and all subwindows
-bool wxApp::SendIdleEvents(wxWindow* win)
-{
- bool needMore = FALSE;
-
- wxIdleEvent event;
- event.SetEventObject(win);
-
- win->GetEventHandler()->ProcessEvent(event);
-
- if (event.MoreRequested())
- needMore = TRUE;
-
- wxWindowListNode* node = win->GetChildren().GetFirst();
- while (node)
- {
- wxWindow* win = (wxWindow*) node->GetData();
- if (SendIdleEvents(win))
- needMore = TRUE;
-
- node = node->GetNext();
- }
-
- win->OnInternalIdle();
-
- return needMore;
-}
-
// Create display, and other initialization
bool wxApp::OnInitGui()
{
#include <pango/pango.h>
#include <pango/pangox.h>
-#include <pango/pangoxft.h>
+#ifdef HAVE_PANGO_XFT
+ #include <pango/pangoxft.h>
+#endif
PangoContext* wxApp::GetPangoContext()
{
Display *xdisplay = (Display*) wxApp::GetDisplay();
-#if 1
+#ifdef HAVE_PANGO_XFT
int xscreen = DefaultScreen(xdisplay);
static int use_xft = -1;
if (use_xft == -1)
Window wxGetWindowParent(Window window)
{
- wxASSERT_MSG( window, "invalid window" );
+ wxASSERT_MSG( window, _T("invalid window") );
return (Window) 0;
- Window parent, root = 0;
+#ifndef __VMS
+ // VMS chokes on unreacheable code
+ Window parent, root = 0;
#if wxUSE_NANOX
int noChildren = 0;
#else
return parent;
else
return (Window) 0;
+#endif
}
void wxApp::Exit()
int i;
for (i = 0; i < 2; i++)
{
- bool s_inYield = FALSE;
+ static bool s_inYield = FALSE;
if ( s_inYield )
{
projects / wxWidgets.git / blobdiff