#include "wx/frame.h"
#include "wx/icon.h"
#include "wx/dialog.h"
+ #include "wx/memory.h"
+ #include "wx/gdicmn.h"
+ #include "wx/module.h"
+ #include "wx/crt.h"
#endif
-#include "wx/gdicmn.h"
-#include "wx/module.h"
-#include "wx/memory.h"
#include "wx/evtloop.h"
-#include "wx/timer.h"
#include "wx/filename.h"
#include "wx/univ/theme.h"
#include "wx/univ/renderer.h"
+#include "wx/generic/private/timer.h"
#if wxUSE_THREADS
#include "wx/thread.h"
// global data
//------------------------------------------------------------------------
-extern wxList wxPendingDelete;
-
wxWindowHash *wxWidgetHashTable = NULL;
wxWindowHash *wxClientWidgetHashTable = NULL;
// X11 error handling
//------------------------------------------------------------------------
-#ifdef __WXDEBUG__
typedef int (*XErrorHandlerFunc)(Display *, XErrorEvent *);
XErrorHandlerFunc gs_pfnXErrorHandler = 0;
else
return 0;
}
-#endif // __WXDEBUG__
//------------------------------------------------------------------------
// wxApp
//------------------------------------------------------------------------
long wxApp::sm_lastMessageTime = 0;
-WXDisplay *wxApp::ms_display = NULL;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxAppBase::OnIdle)
-END_EVENT_TABLE()
-
bool wxApp::Initialize(int& argC, wxChar **argV)
{
-#if defined(__WXDEBUG__) && !wxUSE_NANOX
+#if !wxUSE_NANOX
// install the X error handler
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
-#endif // __WXDEBUG__
+#endif
wxString displayName;
bool syncDisplay = false;
int argCOrig = argC;
for ( int i = 0; i < argCOrig; i++ )
{
- if (wxStrcmp( argV[i], _T("-display") ) == 0)
+ if (wxStrcmp( argV[i], wxT("-display") ) == 0)
{
- if (i < (argC - 1))
+ if (i < (argCOrig - 1))
{
argV[i++] = NULL;
argC -= 2;
}
}
- else if (wxStrcmp( argV[i], _T("-geometry") ) == 0)
+ else if (wxStrcmp( argV[i], wxT("-geometry") ) == 0)
{
- if (i < (argC - 1))
+ if (i < (argCOrig - 1))
{
argV[i++] = NULL;
int w, h;
- if (wxSscanf(argV[i], _T("%dx%d"), &w, &h) != 2)
+ if (wxSscanf(argV[i], wxT("%dx%d"), &w, &h) != 2)
{
wxLogError( _("Invalid geometry specification '%s'"),
wxString(argV[i]).c_str() );
argC -= 2;
}
}
- else if (wxStrcmp( argV[i], _T("-sync") ) == 0)
+ else if (wxStrcmp( argV[i], wxT("-sync") ) == 0)
{
syncDisplay = true;
argV[i] = NULL;
argC--;
}
- else if (wxStrcmp( argV[i], _T("-iconic") ) == 0)
+ else if (wxStrcmp( argV[i], wxT("-iconic") ) == 0)
{
g_showIconic = true;
if ( argC != argCOrig )
{
- // remove the argumens we consumed
+ // remove the arguments we consumed
for ( int i = 0; i < argC; i++ )
{
while ( !argV[i] )
{
- memmove(argV + i, argV + i + 1, argCOrig - i);
+ memmove(argV + i, argV + i + 1, (argCOrig - i)*sizeof(wxChar *));
}
}
}
- // X11 display stuff
- Display *xdisplay;
- if ( displayName.empty() )
- xdisplay = XOpenDisplay( NULL );
- else
- xdisplay = XOpenDisplay( displayName.ToAscii() );
- if (!xdisplay)
+ // open and set up the X11 display
+ if ( !wxSetDisplay(displayName) )
{
- wxLogError( _("wxWidgets could not open display. Exiting.") );
+ wxLogError(_("wxWidgets could not open display. Exiting."));
return false;
}
+ Display *dpy = wxGlobalDisplay();
if (syncDisplay)
- XSynchronize(xdisplay, True);
-
- ms_display = (WXDisplay*) xdisplay;
+ XSynchronize(dpy, True);
- XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
+ XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask);
- // Misc.
wxSetDetectableAutoRepeat( true );
- if ( !wxAppBase::Initialize(argC, argV) )
- {
- XCloseDisplay(xdisplay);
+ if ( !wxAppBase::Initialize(argC, argV) )
return false;
- }
#if wxUSE_UNICODE
// Glib's type system required by Pango
void wxApp::CleanUp()
{
- delete wxWidgetHashTable;
- wxWidgetHashTable = NULL;
- delete wxClientWidgetHashTable;
- wxClientWidgetHashTable = NULL;
+ wxDELETE(wxWidgetHashTable);
+ wxDELETE(wxClientWidgetHashTable);
wxAppBase::CleanUp();
}
wxApp::wxApp()
{
- // TODO: parse the command line
- argc = 0;
- argv = NULL;
-
- m_mainColormap = (WXColormap) NULL;
- m_topLevelWidget = (WXWindow) NULL;
+ m_mainColormap = NULL;
+ m_topLevelWidget = NULL;
m_maxRequestSize = 0;
m_showIconic = false;
m_initialSize = wxDefaultSize;
};
extern "C"
-Bool wxX11ExposePredicate (Display *display, XEvent *xevent, XPointer arg)
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)
{
wxExposeInfo *info = (wxExposeInfo*) arg;
return false;
}
-#ifdef __WXDEBUG__
- wxString windowClass = win->GetClassInfo()->GetClassName();
-#endif
switch (event->type)
{
// If we only have one X11 window, always indicate
// that borders might have to be redrawn.
- if (win->GetMainWindow() == win->GetClientAreaWindow())
+ if (win->X11GetMainWindow() == win->GetClientAreaWindow())
win->NeedUpdateNcAreaInIdle();
// Only erase background, paint in idle time.
#if !wxUSE_NANOX
case GraphicsExpose:
{
- wxLogTrace( _T("expose"), _T("GraphicsExpose from %s"), win->GetName().c_str());
+ wxLogTrace( wxT("expose"), wxT("GraphicsExpose from %s"), win->GetName().c_str());
win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
event->xgraphicsexpose.width, event->xgraphicsexpose.height);
// wxLogDebug( "OnKey from %s", win->GetName().c_str() );
// We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
- if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+ if (win->HandleWindowEvent( keyEvent ))
return true;
keyEvent.SetEventType(wxEVT_CHAR);
// Do the translation again, retaining the ASCII
// code.
- wxTranslateKeyEvent(keyEvent, win, window, event, true);
- if (win->GetEventHandler()->ProcessEvent( keyEvent ))
+ if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+ win->HandleWindowEvent( keyEvent ))
return true;
if ( (keyEvent.m_keyCode == WXK_TAB) &&
/* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
new_event.SetWindowChange( keyEvent.ControlDown() );
new_event.SetCurrentFocus( win );
- return win->GetParent()->GetEventHandler()->ProcessEvent( new_event );
+ return win->GetParent()->HandleWindowEvent( new_event );
}
return false;
wxKeyEvent keyEvent(wxEVT_KEY_UP);
wxTranslateKeyEvent(keyEvent, win, window, event);
- return win->GetEventHandler()->ProcessEvent( keyEvent );
+ return win->HandleWindowEvent( keyEvent );
}
case ConfigureNotify:
{
wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
sizeEvent.SetEventObject( win );
- return win->GetEventHandler()->ProcessEvent( sizeEvent );
+ return win->HandleWindowEvent( sizeEvent );
}
}
return false;
}
#if !wxUSE_NANOX
case PropertyNotify:
- {
- //wxLogDebug("PropertyNotify: %s", windowClass.c_str());
return HandlePropertyChange(_event);
- }
+
case ClientMessage:
{
if (!win->IsEnabled())
wxSizeEvent sizeEvent(sz, win->GetId());
sizeEvent.SetEventObject(win);
- return win->GetEventHandler()->ProcessEvent( sizeEvent );
+ return win->HandleWindowEvent( sizeEvent );
}
#endif
#endif
if (event->type == ButtonPress)
{
- if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+ if ((win != wxWindow::FindFocus()) && win->CanAcceptFocus())
{
// This might actually be done in wxWindow::SetFocus()
// and not here. TODO.
g_prevFocus = wxWindow::FindFocus();
g_nextFocus = win;
- wxLogTrace( _T("focus"), _T("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ wxLogTrace( wxT("focus"), wxT("About to call SetFocus on %s of type %s due to button press"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
// Record the fact that this window is
// getting the focus, because we'll need to
#endif
wxMouseEvent wxevent;
wxTranslateMouseEvent(wxevent, win, window, event);
- return win->GetEventHandler()->ProcessEvent( wxevent );
+ return win->HandleWindowEvent( wxevent );
}
case FocusIn:
#if !wxUSE_NANOX
(event->xfocus.mode == NotifyNormal))
#endif
{
- wxLogTrace( _T("focus"), _T("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
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() );
+ wxLogTrace( wxT("focus"), wxT("FocusIn from %s of type %s being deliberately ignored"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
return true;
}
else
focusEvent.SetWindow( g_prevFocus );
g_prevFocus = NULL;
- return win->GetEventHandler()->ProcessEvent(focusEvent);
+ return win->HandleWindowEvent(focusEvent);
}
}
return false;
(event->xfocus.mode == NotifyNormal))
#endif
{
- wxLogTrace( _T("focus"), _T("FocusOut from %s of type %s"), win->GetName().c_str(), win->GetClassInfo()->GetClassName() );
+ wxLogTrace( wxT("focus"), wxT("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 win->HandleWindowEvent(focusEvent);
}
return false;
-
-#ifdef __WXDEBUG__
- default:
- //wxString eventName = wxGetXEventName(XEvent& event);
- //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
- break;
-#endif // __WXDEBUG__
}
return false;
// This should be redefined in a derived class for
// handling property change events for XAtom IPC.
-bool wxApp::HandlePropertyChange(WXEvent *event)
+bool wxApp::HandlePropertyChange(WXEvent *WXUNUSED(event))
{
// by default do nothing special
// TODO: what to do for X11
// Create display, and other initialization
bool wxApp::OnInitGui()
{
+#if wxUSE_LOG
// Eventually this line will be removed, but for
// now we don't want to try popping up a dialog
// for error messages.
delete wxLog::SetActiveTarget(new wxLogStderr);
+#endif
if (!wxAppBase::OnInitGui())
return false;
- GetMainColormap( wxApp::GetDisplay() );
+ Display *dpy = wxGlobalDisplay();
+ GetMainColormap(dpy);
- m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
+ m_maxRequestSize = XMaxRequestSize(dpy);
#if !wxUSE_NANOX
m_visualInfo = new wxXVisualInfo;
- wxFillXVisualInfo( m_visualInfo, (Display*) wxApp::GetDisplay() );
+ wxFillXVisualInfo(m_visualInfo, dpy);
#endif
return true;
PangoContext* wxApp::GetPangoContext()
{
- static PangoContext *ret = NULL;
- if (ret)
- return ret;
-
- Display *xdisplay = (Display*) wxApp::GetDisplay();
+ static PangoContext *s_pangoContext = NULL;
+ if ( !s_pangoContext )
+ {
+ Display *dpy = wxGlobalDisplay();
#ifdef HAVE_PANGO_XFT
- int xscreen = DefaultScreen(xdisplay);
- static int use_xft = -1;
- if (use_xft == -1)
- {
- wxString val = wxGetenv( L"GDK_USE_XFT" );
- use_xft = (val == L"1");
- }
+ int xscreen = DefaultScreen(dpy);
+ static int use_xft = -1;
+ if (use_xft == -1)
+ {
+ wxString val = wxGetenv( L"GDK_USE_XFT" );
+ use_xft = val == L"1";
+ }
- if (use_xft)
- ret = pango_xft_get_context( xdisplay, xscreen );
- else
-#endif
- ret = pango_x_get_context( xdisplay );
+ if (use_xft)
+ s_pangoContext = pango_xft_get_context(dpy, xscreen);
+ else
+#endif // HAVE_PANGO_XFT
+ s_pangoContext = pango_x_get_context(dpy);
- if (!PANGO_IS_CONTEXT(ret))
- wxLogError( wxT("No pango context.") );
+ if (!PANGO_IS_CONTEXT(s_pangoContext))
+ {
+ wxLogError( wxT("No pango context.") );
+ }
+ }
- return ret;
+ return s_pangoContext;
}
-#endif
+
+#endif // wxUSE_UNICODE
WXColormap wxApp::GetMainColormap(WXDisplay* display)
{
Window wxGetWindowParent(Window window)
{
- wxASSERT_MSG( window, _T("invalid window") );
+ wxASSERT_MSG( window, wxT("invalid window") );
return (Window) 0;
wxAppConsole::Exit();
}
-// Yield to other processes
-
-bool wxApp::Yield(bool onlyIfNeeded)
-{
- // Sometimes only 2 yields seem
- // to do the trick, e.g. in the
- // progress dialog
- int i;
- for (i = 0; i < 2; i++)
- {
- static bool s_inYield = false;
-
- if ( s_inYield )
- {
- if ( !onlyIfNeeded )
- {
- wxFAIL_MSG( wxT("wxYield called recursively" ) );
- }
-
- return false;
- }
-
- s_inYield = true;
-
- // Make sure we have an event loop object,
- // or Pending/Dispatch will fail
- wxEventLoop* eventLoop = wxEventLoop::GetActive();
- wxEventLoop* newEventLoop = NULL;
- if (!eventLoop)
- {
- newEventLoop = new wxEventLoop;
- wxEventLoop::SetActive(newEventLoop);
- }
-
- // Call dispatch at least once so that sockets
- // can be tested
- wxTheApp->Dispatch();
-
- while (wxTheApp && wxTheApp->Pending())
- wxTheApp->Dispatch();
-
-#if wxUSE_TIMER
- wxTimer::NotifyTimers();
-#endif
- ProcessIdle();
-
- if (newEventLoop)
- {
- wxEventLoop::SetActive(NULL);
- delete newEventLoop;
- }
-
- s_inYield = false;
- }
-
- return true;
-}
-
-#ifdef __WXDEBUG__
-
-void wxApp::OnAssert(const wxChar *file, int line, const wxChar* cond, const wxChar *msg)
-{
- // While the GUI isn't working that well, just print out the
- // message.
-#if 1
- wxAppBase::OnAssert(file, line, cond, msg);
-#else
- wxString msg2;
- msg2.Printf("At file %s:%d: %s", file, line, msg);
- wxLogDebug(msg2);
-#endif
-}
-
-#endif // __WXDEBUG__
projects / wxWidgets.git / blobdiff