added default style wxFRAME_TOOL_WINDOW to creation

[wxWidgets.git] / src / x11 / app.cpp

diff --git a/src/x11/app.cpp b/src/x11/app.cpp
index 6b85093ad0bd4c724b2903f8143e571e65149b65..d45ff95d4a9230ba17bff32026c146f450699902 100644 (file)
--- a/src/x11/app.cpp
+++ b/src/x11/app.cpp
@@ -17,12 +17,8 @@
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"
 #include "wx/app.h"
 #include "wx/utils.h"
 #include "wx/gdicmn.h"

-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/cursor.h"

 #include "wx/icon.h"
 #include "wx/dialog.h"
 #include "wx/icon.h"
 #include "wx/dialog.h"

-#include "wx/msgdlg.h"

 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/memory.h"


@@ -30,6 +26,9 @@
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 
 #include "wx/intl.h"
 #include "wx/evtloop.h"
 

+#include "wx/univ/theme.h"
+#include "wx/univ/renderer.h"
+

 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif
 #if wxUSE_THREADS
     #include "wx/thread.h"
 #endif


@@ -43,8 +42,8 @@
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

-#include <X11/Xresource.h>

 #include <X11/Xatom.h>
 #include <X11/Xatom.h>

+

 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif
 #ifdef __VMS__
 #pragma message enable nosimpint
 #endif


@@ -53,7 +52,6 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-extern char *wxBuffer;

 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;
 extern wxList wxPendingDelete;
 
 wxApp *wxTheApp = NULL;


@@ -81,10 +79,15 @@ static int wxXErrorHandler(Display *dpy, XErrorEvent *xevent)
 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 
 long wxApp::sm_lastMessageTime = 0;
 WXDisplay *wxApp::ms_display = NULL;
 

+// This is set within wxEntryStart -- too early on
+// to put these in wxTheApp
+static int g_newArgc = 0;
+static wxChar** g_newArgv = NULL;
+static bool g_showIconic = FALSE;
+static wxSize g_initialSize = wxDefaultSize;
+

 bool wxApp::Initialize()
 {
 bool wxApp::Initialize()
 {

-    wxBuffer = new char[BUFSIZ + 512];
-

     wxClassInfo::InitializeClasses();
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to
     wxClassInfo::InitializeClasses();
 
     // GL: I'm annoyed ... I don't know where to put this and I don't want to


@@ -113,6 +116,10 @@ bool wxApp::Initialize()
 
 void wxApp::CleanUp()
 {
 
 void wxApp::CleanUp()
 {

+    if (g_newArgv)
+        delete[] g_newArgv;
+    g_newArgv = NULL;
+

     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 
     delete wxWidgetHashTable;
     wxWidgetHashTable = NULL;
 


@@ -132,9 +139,6 @@ void wxApp::CleanUp()
     delete wxTheApp;
     wxTheApp = NULL;
 
     delete wxTheApp;
     wxTheApp = NULL;
 

-    delete[] wxBuffer;
-    wxBuffer = NULL;
-

     wxClassInfo::CleanUpClasses();
 
 #if wxUSE_THREADS
     wxClassInfo::CleanUpClasses();
 
 #if wxUSE_THREADS


@@ -149,7 +153,7 @@ void wxApp::CleanUp()
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {
     // wxDebugContext, too.
     if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
     {

-        wxLogDebug("There were memory leaks.\n");
+        wxLogDebug("There were memory leaks.");

         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }
         wxDebugContext::Dump();
         wxDebugContext::PrintStatistics();
     }


@@ -169,19 +173,85 @@ int wxEntryStart( int& argc, char *argv[] )
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif // __WXDEBUG__
 
     gs_pfnXErrorHandler = XSetErrorHandler( wxXErrorHandler );
 #endif // __WXDEBUG__
 

-    Display* xdisplay = XOpenDisplay(NULL);
+    wxString displayName;
+    bool syncDisplay = FALSE;
+
+    // Parse the arguments.
+    // We can't use wxCmdLineParser or OnInitCmdLine and friends because
+    // we have to create the Display earlier. If we can find a way to
+    // use the wxAppBase API then I'll be quite happy to change it.
+    g_newArgv = new wxChar*[argc];
+    g_newArgc = 0;
+    int i;
+    for (i = 0; i < argc; i++)
+    {
+        wxString arg(argv[i]);
+        if (arg == wxT("-display"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                displayName = argv[i];
+                continue;
+            }
+        }
+        else if (arg == wxT("-geometry"))
+        {
+            if (i < (argc - 1))
+            {
+                i ++;
+                wxString windowGeometry = argv[i];
+                int w, h;
+                if (wxSscanf(windowGeometry.c_str(), _T("%dx%d"), &w, &h) != 2)
+                {
+                    wxLogError(_("Invalid geometry specification '%s'"), windowGeometry.c_str());
+                }
+                else
+                {
+                    g_initialSize = wxSize(w, h);
+                }
+                continue;
+            }
+        }
+        else if (arg == wxT("-sync"))
+        {
+            syncDisplay = TRUE;
+            continue;
+        }
+        else if (arg == wxT("-iconic"))
+        {
+            g_showIconic = TRUE;
+
+            continue;
+        }
+
+        // Not eaten by wxWindows, so pass through
+        g_newArgv[g_newArgc] = argv[i];
+        g_newArgc ++;
+    }
+
+    Display* xdisplay;
+    if (displayName.IsEmpty())
+        xdisplay = XOpenDisplay(NULL);
+    else
+        xdisplay = XOpenDisplay(displayName);

 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }
 
     if (!xdisplay)
     {
         wxLogError( _("wxWindows could not open display. Exiting.") );
         return -1;
     }

+
+    if (syncDisplay)
+    {
+        XSynchronize(xdisplay, True);
+    }

     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         
     
     wxApp::ms_display = (WXDisplay*) xdisplay;
     
     XSelectInput( xdisplay, XDefaultRootWindow(xdisplay), PropertyChangeMask);
         

-//    wxSetDetectableAutoRepeat( TRUE );
+    wxSetDetectableAutoRepeat( TRUE );

 
     if (!wxApp::Initialize())
         return -1;
 
     if (!wxApp::Initialize())
         return -1;


@@ -189,7 +259,6 @@ int wxEntryStart( int& argc, char *argv[] )
     return 0;
 }
 
     return 0;
 }
 

-

 int wxEntryInitGui()
 {
     int retValue = 0;
 int wxEntryInitGui()
 {
     int retValue = 0;


@@ -236,8 +305,20 @@ int wxEntry( int argc, char *argv[] )
     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
 
     wxTheApp->SetClassName(wxFileNameFromPath(argv[0]));
     wxTheApp->SetAppName(wxFileNameFromPath(argv[0]));
 

-    wxTheApp->argc = argc;
-    wxTheApp->argv = argv;
+    // The command line may have been changed
+    // by stripping out -display etc.
+    if (g_newArgc > 0)
+    {
+        wxTheApp->argc = g_newArgc;
+        wxTheApp->argv = g_newArgv;
+    }
+    else
+    {
+        wxTheApp->argc = argc;
+        wxTheApp->argv = argv;
+    }
+    wxTheApp->m_showIconic = g_showIconic;
+    wxTheApp->m_initialSize = g_initialSize;

 
     int retValue;
     retValue = wxEntryInitGui();
 
     int retValue;
     retValue = wxEntryInitGui();


@@ -295,6 +376,8 @@ wxApp::wxApp()
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;
     m_topLevelWidget = (WXWindow) NULL;
     m_maxRequestSize = 0;
     m_mainLoop = NULL;

+    m_showIconic = FALSE;
+    m_initialSize = wxDefaultSize;

 }
 
 bool wxApp::Initialized()
 }
 
 bool wxApp::Initialized()


@@ -325,13 +408,8 @@ void wxApp::ProcessXEvent(WXEvent* _event)
     wxWindow* win = NULL;
     Window window = event->xany.window;
     Window actualWindow = window;
     wxWindow* win = NULL;
     Window window = event->xany.window;
     Window actualWindow = window;

-
+    

     // Find the first wxWindow that corresponds to this event window
     // Find the first wxWindow that corresponds to this event window

-    // TODO: may need to translate coordinates from actualWindow
-    // to window, if the receiving window != wxWindow window
-    //    while (window && !(win = wxGetWindowFromTable(window)))
-    //        window = wxGetWindowParent(window);
-

     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,
     // Because we're receiving events after a window
     // has been destroyed, assume a 1:1 match between
     // Window and wxWindow, so if it's not in the table,


@@ -339,7 +417,7 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
     win = wxGetWindowFromTable(window);
     if (!win)
 
     win = wxGetWindowFromTable(window);
     if (!win)

-       return;
+           return;

 
     switch (event->type)
     {
 
     switch (event->type)
     {


@@ -353,6 +431,8 @@ void wxApp::ProcessXEvent(WXEvent* _event)
                 {
                     wxKeyEvent keyEvent(wxEVT_KEY_DOWN);
                     wxTranslateKeyEvent(keyEvent, win, window, event);
                 {
                     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
         
                     // We didn't process wxEVT_KEY_DOWN, so send
                     // wxEVT_CHAR


@@ -382,15 +462,30 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
             return;
         }
             }
             return;
         }

+        case ConfigureNotify:
+        {
+            // Not clear if this is the same in NanoX
+            if (win)
+            {
+                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
+                sizeEvent.SetEventObject( win );
+                
+                win->GetEventHandler()->ProcessEvent( sizeEvent );
+            }
+        }
+#if !wxUSE_NANOX

         case PropertyNotify:
         {
             HandlePropertyChange(_event);
             return;
         }
         case ClientMessage:
         case PropertyNotify:
         {
             HandlePropertyChange(_event);
             return;
         }
         case ClientMessage:

-        {           
-            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);;
-            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);;
+        {
+            if (win && !win->IsEnabled())
+                return;
+
+            Atom wm_delete_window = XInternAtom(wxGlobalDisplay(), "WM_DELETE_WINDOW", True);
+            Atom wm_protocols = XInternAtom(wxGlobalDisplay(), "WM_PROTOCOLS", True);

 
             if (event->xclient.message_type == wm_protocols)
             {
 
             if (event->xclient.message_type == wm_protocols)
             {


@@ -404,19 +499,9 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
             return;
         }
             }
             return;
         }

-        case ConfigureNotify:
-        {
-            if (win)
-            {
-                wxSizeEvent sizeEvent( wxSize(event->xconfigure.width,event->xconfigure.height), win->GetId() );
-                sizeEvent.SetEventObject( win );
-                
-                win->GetEventHandler()->ProcessEvent( sizeEvent );
-            }
-        }

         case ResizeRequest:
         {
         case 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.
             */
             * If resize event, don't resize until the last resize event for this
             * window is recieved. Prevents flicker as windows are resized.
             */


@@ -428,9 +513,6 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             
             report = * event;
             while( XCheckTypedWindowEvent (disp, actualWindow, ResizeRequest, &report));
             

-            // TODO: when implementing refresh optimization, we can use
-            // XtAddExposureToRegion to expand the window's paint region.
-

             if (win)
             {
                 wxSize sz = win->GetSize();
             if (win)
             {
                 wxSize sz = win->GetSize();


@@ -442,15 +524,54 @@ void wxApp::ProcessXEvent(WXEvent* _event)
 
             return;
         }
 
             return;
         }

+#endif
+#if wxUSE_NANOX
+        case GR_EVENT_TYPE_CLOSE_REQ:
+        {
+            if (win)
+            {
+                win->Close(FALSE);
+            }
+            break;
+        }
+#endif

         case Expose:
         {
             if (win)
             {
                 win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
                                               event->xexpose.width, event->xexpose.height);
         case Expose:
         {
             if (win)
             {
                 win->GetUpdateRegion().Union( event->xexpose.x, event->xexpose.y,
                                               event->xexpose.width, event->xexpose.height);

+                                              
+                win->GetClearRegion().Union( event->xexpose.x, event->xexpose.y,
+                                             event->xexpose.width, event->xexpose.height);
+                

                 if (event->xexpose.count == 0)
                 {
                 if (event->xexpose.count == 0)
                 {

-                    win->X11SendPaintEvents();  // TODO let an idle handler do that
+                    // Only erase background, paint in idle time.
+                    win->SendEraseEvents();
+                }
+            }
+
+            return;
+        }
+        case GraphicsExpose:
+        {
+            if (win)
+            {
+                // wxLogDebug( "GraphicsExpose from %s", win->GetName().c_str(),
+                //                              event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                //                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                    
+                win->GetUpdateRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                              event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                              
+                win->GetClearRegion().Union( event->xgraphicsexpose.x, event->xgraphicsexpose.y,
+                                             event->xgraphicsexpose.width, event->xgraphicsexpose.height);
+                                              
+                if (event->xgraphicsexpose.count == 0)
+                {
+                    // Only erase background, paint in idle time.
+                    win->SendEraseEvents();

                 }
             }
 
                 }
             }
 


@@ -462,21 +583,33 @@ void wxApp::ProcessXEvent(WXEvent* _event)
         case ButtonRelease:
         case MotionNotify:
         {
         case ButtonRelease:
         case MotionNotify:
         {

-            if (win && !win->IsEnabled())
+            if (!win)

                 return;
                 return;

-
-            if (win)
+                
+            if (!win->IsEnabled())
+                return;
+            
+#if 1
+            if (event->type == ButtonPress)

             {
             {

-                wxMouseEvent wxevent;
-                wxTranslateMouseEvent(wxevent, win, window, event);
-                win->GetEventHandler()->ProcessEvent( wxevent );
+                if ((win != wxWindow::FindFocus()) && win->AcceptsFocus())
+                   win->SetFocus();

             }
             }

+#endif
+
+            wxMouseEvent wxevent;
+            wxTranslateMouseEvent(wxevent, win, window, event);
+            win->GetEventHandler()->ProcessEvent( wxevent );

             return;
         }
         case FocusIn:
             {
             return;
         }
         case FocusIn:
             {

+#if !wxUSE_NANOX

                 if (win && event->xfocus.detail != NotifyPointer)
                 if (win && event->xfocus.detail != NotifyPointer)

+#endif

                 {
                 {

+                    wxLogDebug( "FocusIn from %s", win->GetName().c_str() );
+                    

                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);
                     wxFocusEvent focusEvent(wxEVT_SET_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);


@@ -485,8 +618,12 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
         case FocusOut:
             {
             }
         case FocusOut:
             {

+#if !wxUSE_NANOX

                 if (win && event->xfocus.detail != NotifyPointer)
                 if (win && event->xfocus.detail != NotifyPointer)

+#endif

                 {
                 {

+                    wxLogDebug( "FocusOut from %s", win->GetName().c_str() );
+                    

                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);
                     wxFocusEvent focusEvent(wxEVT_KILL_FOCUS, win->GetId());
                     focusEvent.SetEventObject(win);
                     win->GetEventHandler()->ProcessEvent(focusEvent);


@@ -501,6 +638,10 @@ void wxApp::ProcessXEvent(WXEvent* _event)
             }
         default:
         {
             }
         default:
         {

+#ifdef __WXDEBUG__
+            //wxString eventName = wxGetXEventName(XEvent& event);
+            //wxLogDebug(wxT("Event %s not handled"), eventName.c_str());
+#endif

             break;
         }
     }
             break;
         }
     }


@@ -542,46 +683,33 @@ void wxApp::HandlePropertyChange(WXEvent *event)
 {
     // by default do nothing special
     // TODO: what to do for X11
 {
     // by default do nothing special
     // TODO: what to do for X11

-    // XtDispatchEvent((XEvent*) event); /* let Motif do the work */
+    // XtDispatchEvent((XEvent*) event);

 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {
 }
 
 void wxApp::OnIdle(wxIdleEvent& event)
 {

-    static bool inOnIdle = FALSE;
+    static bool s_inOnIdle = FALSE;

 
     // Avoid recursion (via ProcessEvent default case)
 
     // Avoid recursion (via ProcessEvent default case)

-    if (inOnIdle)
+    if (s_inOnIdle)

         return;
 
         return;
 

-    inOnIdle = TRUE;
+    s_inOnIdle = TRUE;

 
 

-    // If there are pending events, we must process them: pending events
-    // are either events to the threads other than main or events posted
-    // with wxPostEvent() functions
-    // GRG: I have moved this here so that all pending events are processed
-    //   before starting to delete any objects. This behaves better (in
-    //   particular, wrt wxPostEvent) and is coherent with wxGTK's current
-    //   behaviour. Also removed the '#if wxUSE_THREADS' around it.
-    //  Changed Mar/2000 before 2.1.14
-
-    // Flush pending events.
+    // Resend in the main thread events which have been prepared in other
+    // threads

     ProcessPendingEvents();
 
     ProcessPendingEvents();
 

-    // 'Garbage' collection of windows deleted with Close().
+    // 'Garbage' collection of windows deleted with Close()

     DeletePendingObjects();
 
     DeletePendingObjects();
 

-    // flush the logged messages if any
-    wxLog *pLog = wxLog::GetActiveTarget();
-    if ( pLog != NULL && pLog->HasPendingMessages() )
-        pLog->Flush();
-

     // Send OnIdle events to all windows
     bool needMore = SendIdleEvents();
 
     if (needMore)
         event.RequestMore(TRUE);
 
     // Send OnIdle events to all windows
     bool needMore = SendIdleEvents();
 
     if (needMore)
         event.RequestMore(TRUE);
 

-    inOnIdle = FALSE;
+    s_inOnIdle = FALSE;

 }
 
 void wxWakeUpIdle()
 }
 
 void wxWakeUpIdle()


@@ -615,7 +743,10 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);

-    win->ProcessEvent(event);
+
+    win->GetEventHandler()->ProcessEvent(event);
+
+    win->OnInternalIdle();

 
     if (event.MoreRequested())
         needMore = TRUE;
 
     if (event.MoreRequested())
         needMore = TRUE;


@@ -629,7 +760,8 @@ bool wxApp::SendIdleEvents(wxWindow* win)
 
         node = node->Next();
     }
 
         node = node->Next();
     }

-    return needMore ;
+    
+    return needMore;

 }
 
 void wxApp::DeletePendingObjects()
 }
 
 void wxApp::DeletePendingObjects()


@@ -650,7 +782,7 @@ void wxApp::DeletePendingObjects()
     }
 }
 
     }
 }
 

-// Create an application context
+// Create display, and other initialization

 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for
 bool wxApp::OnInitGui()
 {
     // Eventually this line will be removed, but for


@@ -661,8 +793,8 @@ bool wxApp::OnInitGui()
     if (!wxAppBase::OnInitGui())
        return FALSE;
     
     if (!wxAppBase::OnInitGui())
        return FALSE;
     

-

     GetMainColormap( wxApp::GetDisplay() );
     GetMainColormap( wxApp::GetDisplay() );

+

     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;
     m_maxRequestSize = XMaxRequestSize( (Display*) wxApp::GetDisplay() );
 
     return TRUE;


@@ -686,6 +818,10 @@ WXColormap wxApp::GetMainColormap(WXDisplay* display)
 
 Window wxGetWindowParent(Window window)
 {
 
 Window wxGetWindowParent(Window window)
 {

+    wxASSERT_MSG( window, "invalid window" );
+    
+    return (Window) 0;
+

     Window parent, root = 0;
     unsigned int noChildren = 0;
     Window* children = NULL;
     Window parent, root = 0;
     unsigned int noChildren = 0;
     Window* children = NULL;


@@ -739,39 +875,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
     return TRUE;
 }
 
     return TRUE;
 }
 

-// TODO use XmGetPixmap (?) to get the really standard icons!
-
-// XPM hack: make the arrays const
-#define static static const
-
-#include "wx/generic/info.xpm"
-#include "wx/generic/error.xpm"
-#include "wx/generic/question.xpm"
-#include "wx/generic/warning.xpm"
-
-#undef static
-
-wxIcon
-wxApp::GetStdIcon(int which) const
+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);
-    }
+    return wxTheme::Get()->GetRenderer()->GetStdIcon(which);

 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 }
 
 void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)


@@ -787,13 +893,3 @@ void wxApp::OnAssert(const wxChar *file, int line, const wxChar *msg)
 #endif
 }
 
 #endif
 }
 

-// ----------------------------------------------------------------------------
-// accessors for C modules
-// ----------------------------------------------------------------------------
-
-#if 0
-extern "C" XtAppContext wxGetAppContext()
-{
-    return (XtAppContext)wxTheApp->GetAppContext();
-}
-#endif