/////////////////////////////////////////////////////////////////////////////
-// Name: app.cpp
+// Name: src/x11/app.cpp
// Purpose: wxApp
// Author: Julian Smart
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
- #pragma implementation "app.h"
-#endif
+// for compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#include "wx/frame.h"
#include "wx/app.h"
-#include "wx/utils.h"
-#include "wx/gdicmn.h"
-#include "wx/icon.h"
-#include "wx/dialog.h"
-#include "wx/log.h"
-#include "wx/module.h"
-#include "wx/memory.h"
-#include "wx/log.h"
-#include "wx/intl.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/hash.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/utils.h"
+ #include "wx/frame.h"
+ #include "wx/icon.h"
+ #include "wx/dialog.h"
+ #include "wx/memory.h"
+ #include "wx/gdicmn.h"
+ #include "wx/module.h"
+#endif
+
#include "wx/evtloop.h"
-#include "wx/timer.h"
#include "wx/filename.h"
-#include "wx/hash.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;
-wxHashTable *wxWidgetHashTable = NULL;
-wxHashTable *wxClientWidgetHashTable = NULL;
-
-static bool g_showIconic = FALSE;
+static bool g_showIconic = false;
static wxSize g_initialSize = wxDefaultSize;
// This is required for wxFocusEvent::SetWindow(). It will only
//------------------------------------------------------------------------
long wxApp::sm_lastMessageTime = 0;
-WXDisplay *wxApp::ms_display = NULL;
IMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler)
-BEGIN_EVENT_TABLE(wxApp, wxEvtHandler)
- EVT_IDLE(wxApp::OnIdle)
-END_EVENT_TABLE()
-
-bool wxApp::Initialize(int& argc, wxChar **argv)
+bool wxApp::Initialize(int& argC, wxChar **argV)
{
#if defined(__WXDEBUG__) && !wxUSE_NANOX
// install the X error handler
gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
#endif // __WXDEBUG__
- char *displayName = NULL;
- bool syncDisplay = FALSE;
+ wxString displayName;
+ bool syncDisplay = false;
- int argcOrig = argc;
- for ( int i = 0; i < argcOrig; i++ )
+ int argCOrig = argC;
+ for ( int i = 0; i < argCOrig; i++ )
{
- if (wxStrcmp( argv[i], _T("-display") ) == 0)
+ if (wxStrcmp( argV[i], _T("-display") ) == 0)
{
- if (i < (argc - 1))
+ if (i < (argC - 1))
{
- argv[i++] = NULL;
+ argV[i++] = NULL;
- displayName = argv[i];
+ displayName = argV[i];
- argv[i] = NULL;
- argc -= 2;
+ argV[i] = NULL;
+ argC -= 2;
}
}
- else if (wxStrcmp( argv[i], _T("-geometry") ) == 0)
+ else if (wxStrcmp( argV[i], _T("-geometry") ) == 0)
{
- if (i < (argc - 1))
+ if (i < (argC - 1))
{
- argv[i++] = NULL;
+ argV[i++] = NULL;
int w, h;
- if (wxSscanf(argv[i], _T("%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() );
+ wxString(argV[i]).c_str() );
}
else
{
g_initialSize = wxSize(w, h);
}
- argv[i] = NULL;
- argc -= 2;
+ argV[i] = NULL;
+ argC -= 2;
}
}
- else if (wxStrcmp( argv[i], _T("-sync") ) == 0)
+ else if (wxStrcmp( argV[i], _T("-sync") ) == 0)
{
- syncDisplay = TRUE;
+ syncDisplay = true;
- argv[i] = NULL;
- argc--;
+ argV[i] = NULL;
+ argC--;
}
- else if (wxStrcmp( argv[i], _T("-iconic") ) == 0)
+ else if (wxStrcmp( argV[i], _T("-iconic") ) == 0)
{
- g_showIconic = TRUE;
+ g_showIconic = true;
- argv[i] = NULL;
- argc--;
+ argV[i] = NULL;
+ argC--;
}
}
- if ( argc != argcOrig )
+ if ( argC != argCOrig )
{
// remove the argumens we consumed
- for ( int i = 0; i < argc; i++ )
+ for ( int i = 0; i < argC; i++ )
{
- while ( !argv[i] )
+ while ( !argV[i] )
{
- memmove(argv + i, argv + i + 1, argcOrig - i);
+ memmove(argV + i, argV + i + 1, argCOrig - i);
}
}
}
- // X11 display stuff
- Display *xdisplay = XOpenDisplay( displayName );
- if (!xdisplay)
+ // open and set up the X11 display
+ if ( !wxSetDisplay(displayName) )
{
- wxLogError( _("wxWindows could not open display. Exiting.") );
- return false;
- }
-
- if ( !wxAppBase::Initialize(argc, argv) )
- {
- XCloseDisplay(xdisplay);
-
+ wxLogError(_("wxWidgets could not open display. Exiting."));
return false;
}
+ Display *dpy = wxGlobalDisplay();
if (syncDisplay)
- XSynchronize(xdisplay, True);
+ XSynchronize(dpy, True);
- ms_display = (WXDisplay*) xdisplay;
+ XSelectInput(dpy, XDefaultRootWindow(dpy), PropertyChangeMask);
- XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
+ wxSetDetectableAutoRepeat( true );
- // Misc.
- wxSetDetectableAutoRepeat( TRUE );
+
+ if ( !wxAppBase::Initialize(argC, argV) )
+ return false;
#if wxUSE_UNICODE
// Glib's type system required by Pango
wxFont::SetDefaultEncoding(wxLocale::GetSystemEncoding());
#endif
- wxWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
- wxClientWidgetHashTable = new wxHashTable(wxKEY_INTEGER);
+ wxWidgetHashTable = new wxWindowHash;
+ wxClientWidgetHashTable = new wxWindowHash;
return true;
}
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_mainLoop = NULL;
- m_showIconic = FALSE;
+ m_showIconic = false;
m_initialSize = wxDefaultSize;
#if !wxUSE_NANOX
#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
//-----------------------------------------------------------------------
Bool found_non_matching;
};
-static Bool expose_predicate (Display *display, XEvent *xevent, XPointer arg)
+extern "C"
+Bool wxX11ExposePredicate (Display *WXUNUSED(display), XEvent *xevent, XPointer arg)
{
wxExposeInfo *info = (wxExposeInfo*) arg;
if (xevent->xany.type != Expose)
{
- info->found_non_matching = TRUE;
+ info->found_non_matching = true;
return FALSE;
}
if (xevent->xexpose.window != info->window)
{
- info->found_non_matching = TRUE;
+ info->found_non_matching = true;
return FALSE;
}
return TRUE;
}
-#endif
- // wxUSE_NANOX
+
+#endif // wxUSE_NANOX
//-----------------------------------------------------------------------
-// Processes an X event, returning TRUE if the event was processed.
+// Processes an X event, returning true if the event was processed.
//-----------------------------------------------------------------------
bool wxApp::ProcessXEvent(WXEvent* _event)
win = wxGetClientWindowFromTable(window);
if (!win)
#endif
- return FALSE;
+ return false;
}
#ifdef __WXDEBUG__
XEvent tmp_event;
wxExposeInfo info;
info.window = event->xexpose.window;
- info.found_non_matching = FALSE;
- while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+ info.found_non_matching = false;
+ while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info ))
{
// Don't worry about optimizing redrawing the border etc.
}
XEvent tmp_event;
wxExposeInfo info;
info.window = event->xexpose.window;
- info.found_non_matching = FALSE;
- while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, expose_predicate, (XPointer) &info ))
+ info.found_non_matching = false;
+ while (XCheckIfEvent( wxGlobalDisplay(), &tmp_event, wxX11ExposePredicate, (XPointer) &info ))
{
win->GetUpdateRegion().Union( tmp_event.xexpose.x, tmp_event.xexpose.y,
tmp_event.xexpose.width, tmp_event.xexpose.height );
//win->Update();
}
- return TRUE;
+ return true;
}
#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,
// win->Update();
}
- return TRUE;
+ return true;
}
#endif
case KeyPress:
{
if (!win->IsEnabled())
- return FALSE;
+ return false;
wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
wxTranslateKeyEvent(keyEvent, win, window, event);
// wxLogDebug( "OnKey from %s", win->GetName().c_str() );
// We didn't process wxEVT_KEY_DOWN, so send wxEVT_CHAR
- if (win->GetEventHandler()->ProcessEvent( keyEvent ))
- return TRUE;
+ 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 ))
- return TRUE;
+ if (wxTranslateKeyEvent(keyEvent, win, window, event, true) &&
+ win->HandleWindowEvent( keyEvent ))
+ return true;
if ( (keyEvent.m_keyCode == WXK_TAB) &&
win->GetParent() && (win->GetParent()->HasFlag( wxTAB_TRAVERSAL)) )
/* 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;
+ return false;
}
case KeyRelease:
{
if (!win->IsEnabled())
- return FALSE;
+ return false;
wxKeyEvent keyEvent(wxEVT_KEY_UP);
wxTranslateKeyEvent(keyEvent, win, window, event);
- return win->GetEventHandler()->ProcessEvent( keyEvent );
+ return win->HandleWindowEvent( keyEvent );
}
case ConfigureNotify:
{
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
wxSizeEvent sizeEvent( wxSize(XConfigureEventGetWidth(event), XConfigureEventGetHeight(event)), win->GetId() );
sizeEvent.SetEventObject( win );
- return win->GetEventHandler()->ProcessEvent( sizeEvent );
+ return win->HandleWindowEvent( sizeEvent );
}
}
- return FALSE;
- break;
+ return false;
}
#if !wxUSE_NANOX
case PropertyNotify:
case ClientMessage:
{
if (!win->IsEnabled())
- return FALSE;
+ return false;
Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);
{
if ((Atom) (event->xclient.data.l[0]) == wm_delete_window)
{
- win->Close(FALSE);
- return TRUE;
+ win->Close(false);
+ return true;
}
}
- return FALSE;
+ return false;
}
#if 0
case DestroyNotify:
wxSizeEvent sizeEvent(sz, win->GetId());
sizeEvent.SetEventObject(win);
- return win->GetEventHandler()->ProcessEvent( sizeEvent );
+ return win->HandleWindowEvent( sizeEvent );
}
#endif
#endif
{
if (win)
{
- win->Close(FALSE);
- return TRUE;
+ win->Close(false);
+ return true;
}
- return FALSE;
+ return false;
break;
}
#endif
case MotionNotify:
{
if (!win->IsEnabled())
- return FALSE;
+ return false;
// Here we check if the top level window is
// disabled, which is one aspect of modality.
while (tlw && !tlw->IsTopLevel())
tlw = tlw->GetParent();
if (tlw && !tlw->IsEnabled())
- return FALSE;
+ return false;
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.
{
// Throw out NotifyGrab and NotifyUngrab
if (event->xcrossing.mode != NotifyNormal)
- return FALSE;
+ return false;
}
#endif
wxMouseEvent wxevent;
wxTranslateMouseEvent(wxevent, win, window, event);
- return win->GetEventHandler()->ProcessEvent( wxevent );
+ return win->HandleWindowEvent( 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->HandleWindowEvent(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->HandleWindowEvent(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
// 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
// XtDispatchEvent((XEvent*) event);
- 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;
+ return false;
}
void wxApp::WakeUpIdle()
}
-// 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()
{
+#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;
+ 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;
+ return true;
}
#if wxUSE_UNICODE
#include <pango/pango.h>
#include <pango/pangox.h>
-#include <pango/pangoxft.h>
+#ifdef HAVE_PANGO_XFT
+ #include <pango/pangoxft.h>
+#endif
PangoContext* wxApp::GetPangoContext()
{
- static PangoContext *ret = NULL;
- if (ret)
- return ret;
-
- Display *xdisplay = (Display*) wxApp::GetDisplay();
-
-#if 1
- int xscreen = DefaultScreen(xdisplay);
- static int use_xft = -1;
- if (use_xft == -1)
+ static PangoContext *s_pangoContext = NULL;
+ if ( !s_pangoContext )
{
- wxString val = wxGetenv( L"GDK_USE_XFT" );
- use_xft = (val == L"1");
- }
+ Display *dpy = wxGlobalDisplay();
- if (use_xft)
- ret = pango_xft_get_context( xdisplay, xscreen );
- else
-#endif
- ret = pango_x_get_context( xdisplay );
+#ifdef HAVE_PANGO_XFT
+ 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)
+ 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, "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 )
{
wxFAIL_MSG( wxT("wxYield called recursively" ) );
}
- return FALSE;
+ return false;
}
- s_inYield = TRUE;
+ s_inYield = true;
// Make sure we have an event loop object,
// or Pending/Dispatch will fail
- wxEventLoop* eventLoop = wxEventLoop::GetActive();
+ wxEventLoopBase * const eventLoop = wxEventLoop::GetActive();
wxEventLoop* newEventLoop = NULL;
if (!eventLoop)
{
wxTheApp->Dispatch();
#if wxUSE_TIMER
- wxTimer::NotifyTimers();
+ wxGenericTimerImpl::NotifyTimers();
#endif
ProcessIdle();
delete newEventLoop;
}
- s_inYield = FALSE;
+ s_inYield = false;
}
- return TRUE;
+ return true;
}
#ifdef __WXDEBUG__
}
#endif // __WXDEBUG__
-
projects / wxWidgets.git / blobdiff