A bit more or multi-format clipboard.

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

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 0aee0d7761bb1835db888c3fdd279427bdfc3cdc..b307cdd8e3d9c5e0f6aefc9eeab8ae590dc018e8 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -45,12 +45,8 @@
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;
 //-----------------------------------------------------------------------------
 
 wxApp *wxTheApp = (wxApp *)  NULL;

-wxAppInitializerFunction wxApp::m_appInitFn = (wxAppInitializerFunction) NULL;
+wxAppInitializerFunction wxAppBase::m_appInitFn = (wxAppInitializerFunction) NULL;

 
 

-#if wxUSE_THREADS
-extern wxList *wxPendingEvents;
-extern wxCriticalSection *wxPendingEventsLocker;
-#endif

 extern wxResourceCache *wxTheResourceCache;
 extern bool g_isIdle;
 
 extern wxResourceCache *wxTheResourceCache;
 extern bool g_isIdle;
 


@@ -126,7 +122,7 @@ unsigned char g_palette[64*3] =
 // local functions
 //-----------------------------------------------------------------------------
 
 // local functions
 //-----------------------------------------------------------------------------
 

-extern void wxFlushResources(void);
+extern void wxFlushResources();

 
 //-----------------------------------------------------------------------------
 // global functions
 
 //-----------------------------------------------------------------------------
 // global functions


@@ -142,57 +138,47 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) );
 
 bool wxYield()
 {
 
 bool wxYield()
 {

-    /* it's necessary to call ProcessIdle() to update the frames sizes which
-       might have been changed (it also will update other things set from
-       OnUpdateUI() which is a nice (and desired) side effect) */
-    while (wxTheApp->ProcessIdle()) { }
-       
-#if 0
-    for ( wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow *win = node->GetData();
-        win->OnInternalIdle();
-    }
-#endif
+    bool has_idle = (wxTheApp->m_idleTag != 0);

 
 

-    if (wxTheApp->m_idleTag)
+    if (has_idle)

     {
         /* We need to temporarily remove idle callbacks or the loop will
            never finish. */
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;
     {
         /* We need to temporarily remove idle callbacks or the loop will
            never finish. */
         gtk_idle_remove( wxTheApp->m_idleTag );
         wxTheApp->m_idleTag = 0;

+    }

 
 

-        while (gtk_events_pending())
-            gtk_main_iteration();
+    while (gtk_events_pending())
+        gtk_main_iteration();

 
 

+    /* it's necessary to call ProcessIdle() to update the frames sizes which
+       might have been changed (it also will update other things set from
+       OnUpdateUI() which is a nice (and desired) side effect) */
+    while (wxTheApp->ProcessIdle()) { }
+
+    if (has_idle)
+    {

         /* re-add idle handler */
         wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     }
         /* re-add idle handler */
         wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     }

-    else
-    {
-        while (gtk_events_pending())
-            gtk_main_iteration();
-    }
-    
+

     return TRUE;
 }
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;
     return TRUE;
 }
 
 gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp) return TRUE;

-    
+

 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's idle handler we
        are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
 #endif
 #if (GTK_MINOR_VERSION > 0)
     /* when getting called from GDK's idle handler we
        are no longer within GDK's grab on the GUI
        thread so we must lock it here ourselves */
     GDK_THREADS_ENTER ();
 #endif

-    
+

     /* sent idle event to all who request them */
     while (wxTheApp->ProcessIdle()) { }
     /* sent idle event to all who request them */
     while (wxTheApp->ProcessIdle()) { }

-    
+

     /* we don't want any more idle events until the next event is
        sent to wxGTK */
     gtk_idle_remove( wxTheApp->m_idleTag );
     /* we don't want any more idle events until the next event is
        sent to wxGTK */
     gtk_idle_remove( wxTheApp->m_idleTag );


@@ -204,7 +190,7 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
        once each time after the event queue has been completely
        emptied */
     g_isIdle = TRUE;
        once each time after the event queue has been completely
        emptied */
     g_isIdle = TRUE;

-    
+

 #if (GTK_MINOR_VERSION > 0)
     /* release lock again */
     GDK_THREADS_LEAVE ();
 #if (GTK_MINOR_VERSION > 0)
     /* release lock again */
     GDK_THREADS_LEAVE ();


@@ -215,50 +201,67 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 
 void wxapp_install_idle_handler()
 {
 
 void wxapp_install_idle_handler()
 {

-    wxASSERT_MSG( wxTheApp->m_idleTag == 0, _T("attempt to install idle handler twice") );
+    wxASSERT_MSG( wxTheApp->m_idleTag == 0, wxT("attempt to install idle handler twice") );

 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */
 
     wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
 
     /* this routine gets called by all event handlers
        indicating that the idle is over. */
 
     wxTheApp->m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );

-    
+

     g_isIdle = FALSE;
 }
 
     g_isIdle = FALSE;
 }
 

-/*

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+
+/* forward declaration */
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) );
+
+void wxapp_install_thread_wakeup()

 {
 {

+    if (wxTheApp->m_wakeUpTimerTag) return;
+
+    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 100, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+}
+
+void wxapp_uninstall_thread_wakeup()
+{
+    if (!wxTheApp->m_wakeUpTimerTag) return;
+

     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
     wxTheApp->m_wakeUpTimerTag = 0;
     gtk_timeout_remove( wxTheApp->m_wakeUpTimerTag );
     wxTheApp->m_wakeUpTimerTag = 0;

-    
+}
+
+static gint wxapp_wakeup_timerout_callback( gpointer WXUNUSED(data) )
+{
+    wxapp_uninstall_thread_wakeup();
+

 #if (GTK_MINOR_VERSION > 0)
 #if (GTK_MINOR_VERSION > 0)

-    // when getting called from GDK's time-out handler 
+    // when getting called from GDK's time-out handler

     // we are no longer within GDK's grab on the GUI
     // thread so we must lock it here ourselves
     GDK_THREADS_ENTER ();
 #endif
     // we are no longer within GDK's grab on the GUI
     // thread so we must lock it here ourselves
     GDK_THREADS_ENTER ();
 #endif

-    
+

     // unblock other threads wishing to do some GUI things
     wxMutexGuiLeave();
     // unblock other threads wishing to do some GUI things
     wxMutexGuiLeave();

-    
+

     // wake up other threads
     wxUsleep( 1 );
     // wake up other threads
     wxUsleep( 1 );

-    
+

     // block other thread again
     wxMutexGuiEnter();
     // block other thread again
     wxMutexGuiEnter();

-    
+

 #if (GTK_MINOR_VERSION > 0)
     // release lock again
     GDK_THREADS_LEAVE ();
 #endif
 #if (GTK_MINOR_VERSION > 0)
     // release lock again
     GDK_THREADS_LEAVE ();
 #endif

-    
-    wxTheApp->m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
-    
+
+    wxapp_install_thread_wakeup();
+

     return TRUE;
 }
     return TRUE;
 }

-#endif
-*/
+
+#endif // wxUSE_THREADS

 
 //-----------------------------------------------------------------------------
 // wxApp
 
 //-----------------------------------------------------------------------------
 // wxApp


@@ -278,12 +281,11 @@ wxApp::wxApp()
     m_exitOnFrameDelete = TRUE;
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );
     m_exitOnFrameDelete = TRUE;
 
     m_idleTag = gtk_idle_add( wxapp_idle_callback, (gpointer) NULL );

-    
-/*
+

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    m_wakeUpTimerTag = gtk_timeout_add( 20, wxapp_wakeup_timerout_callback, (gpointer) NULL );
+    m_wakeUpTimerTag = 0;
+    wxapp_install_thread_wakeup();

 #endif
 #endif

-*/

 
     m_colorCube = (unsigned char*) NULL;
 }
 
     m_colorCube = (unsigned char*) NULL;
 }


@@ -292,12 +294,10 @@ wxApp::~wxApp()
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 
 {
     if (m_idleTag) gtk_idle_remove( m_idleTag );
 

-/*

 #if wxUSE_THREADS
 #if wxUSE_THREADS

-    if (m_wakeUpTimerTag) gtk_timeout_remove( m_wakeUpTimerTag );
+    wxapp_uninstall_thread_wakeup();

 #endif
 #endif

-*/
-    
+

     if (m_colorCube) free(m_colorCube);
 }
 
     if (m_colorCube) free(m_colorCube);
 }
 


@@ -305,7 +305,7 @@ bool wxApp::OnInitGui()
 {
     GdkVisual *visual = gdk_visual_get_system();
 
 {
     GdkVisual *visual = gdk_visual_get_system();
 

-    /* on some machines, the default visual is just 256 colours, so 
+    /* on some machines, the default visual is just 256 colours, so

        we make sure we get the best. this can sometimes be wasteful,
        of course, but what do these guys pay $30.000 for? */
 /*
        we make sure we get the best. this can sometimes be wasteful,
        of course, but what do these guys pay $30.000 for? */
 /*


@@ -316,11 +316,11 @@ bool wxApp::OnInitGui()
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );
 
         GdkColormap *colormap = gdk_colormap_new( vis, FALSE );
         gtk_widget_set_default_colormap( colormap );

-       
-       visual = vis;
+
+        visual = vis;

     }
 */
     }
 */

-    
+

     /* Nothing to do for 15, 16, 24, 32 bit displays */
     if (visual->depth > 8) return TRUE;
 
     /* Nothing to do for 15, 16, 24, 32 bit displays */
     if (visual->depth > 8) return TRUE;
 


@@ -378,24 +378,24 @@ bool wxApp::OnInitGui()
                         int bdiff = ((bb << 8) - colors[i].blue);
                         int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
                         if (sum < max)
                         int bdiff = ((bb << 8) - colors[i].blue);
                         int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
                         if (sum < max)

-                        { 
+                        {

                             index = i; max = sum;
                         }
                     }
                 }
                             index = i; max = sum;
                         }
                     }
                 }

-               else
-               {
+                else
+                {

 #if (GTK_MINOR_VERSION > 0)
 #if (GTK_MINOR_VERSION > 0)

-                   /* assume 8-bit true or static colors. this really
-                      exists. */
-                   GdkVisual* vis = gdk_colormap_get_visual( cmap );
-                   index = (r >> (5 - vis->red_prec)) << vis->red_shift;
-                   index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
-                   index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;
+                    /* assume 8-bit true or static colors. this really
+                       exists. */
+                    GdkVisual* vis = gdk_colormap_get_visual( cmap );
+                    index = (r >> (5 - vis->red_prec)) << vis->red_shift;
+                    index |= (g >> (5 - vis->green_prec)) << vis->green_shift;
+                    index |= (b >> (5 - vis->blue_prec)) << vis->blue_shift;

 #else
 #else

-                    wxFAIL_MSG( _T("Unsupported graphics hardware") );
+                    wxFAIL_MSG( wxT("Unsupported graphics hardware") );

 #endif
 #endif

-               }
+                }

                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }
                 m_colorCube[ (r*1024) + (g*32) + b ] = index;
             }
         }


@@ -415,19 +415,17 @@ bool wxApp::ProcessIdle()
 
 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 wxUSE_THREADS

     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();
     /* Resend in the main thread events which have been prepared in other
        threads */
     ProcessPendingEvents();

-#endif

 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();
 
     /* 'Garbage' collection of windows deleted with Close(). */
     DeletePendingObjects();


@@ -445,7 +443,7 @@ void wxApp::OnIdle( wxIdleEvent &event )
     if (needMore)
         event.RequestMore(TRUE);
 
     if (needMore)
         event.RequestMore(TRUE);
 

-    inOnIdle = FALSE;
+    s_inOnIdle = FALSE;

 }
 
 bool wxApp::SendIdleEvents()
 }
 
 bool wxApp::SendIdleEvents()


@@ -471,10 +469,10 @@ bool wxApp::SendIdleEvents( wxWindow* win )
     wxIdleEvent event;
     event.SetEventObject(win);
 
     wxIdleEvent event;
     event.SetEventObject(win);
 

-    win->OnInternalIdle();
-

     win->ProcessEvent(event);
 
     win->ProcessEvent(event);
 

+    win->OnInternalIdle();
+

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


@@ -516,25 +514,6 @@ void wxApp::Dispatch()
     gtk_main_iteration();
 }
 
     gtk_main_iteration();
 }
 

-#if wxUSE_THREADS
-void wxApp::ProcessPendingEvents()
-{
-    wxNode *node = wxPendingEvents->First();
-    wxCriticalSectionLocker locker(*wxPendingEventsLocker);
-
-    while (node)
-    {
-        wxEvtHandler *handler = (wxEvtHandler *)node->Data();
-
-        handler->ProcessPendingEvents();
-
-        delete node;
-
-        node = wxPendingEvents->First();
-    }
-}
-#endif // wxUSE_THREADS
-

 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();
 void wxApp::DeletePendingObjects()
 {
     wxNode *node = wxPendingDelete.First();


@@ -551,21 +530,6 @@ void wxApp::DeletePendingObjects()
     }
 }
 
     }
 }
 

-wxWindow *wxApp::GetTopWindow()
-{
-    if (m_topWindow)
-        return m_topWindow;
-    else if (wxTopLevelWindows.GetCount() > 0)
-        return wxTopLevelWindows.GetFirst()->GetData();
-    else
-        return NULL;
-}
-
-void wxApp::SetTopWindow( wxWindow *win )
-{
-    m_topWindow = win;
-}
-

 bool wxApp::Initialize()
 {
     wxBuffer = new wxChar[BUFSIZ + 512];
 bool wxApp::Initialize()
 {
     wxBuffer = new wxChar[BUFSIZ + 512];


@@ -598,8 +562,6 @@ bool wxApp::Initialize()
     wxInitializeResourceSystem();
 #endif
 
     wxInitializeResourceSystem();
 #endif
 

-    wxImage::InitStandardHandlers();
-

     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 
     wxModule::RegisterModules();
     if (!wxModule::InitializeModules()) return FALSE;
 


@@ -633,8 +595,6 @@ void wxApp::CleanUp()
 
     wxDeleteStockLists();
 
 
     wxDeleteStockLists();
 

-    wxImage::CleanUpHandlers();
-

     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 
     delete wxTheApp;
     wxTheApp = (wxApp*) NULL;
 


@@ -655,7 +615,7 @@ void wxApp::CleanUp()
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {
 #if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
     if (wxDebugContext::CountObjectsLeft() > 0)
     {

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

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


@@ -668,13 +628,8 @@ void wxApp::CleanUp()
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog)
         delete oldLog;
     wxLog *oldLog = wxLog::SetActiveTarget( (wxLog*) NULL );
     if (oldLog)
         delete oldLog;

-}
-
-wxLog *wxApp::CreateLogTarget()
-{
-    return new wxLogGui;
-}

 #endif // wxUSE_LOG
 #endif // wxUSE_LOG

+}

 
 //-----------------------------------------------------------------------------
 // wxEntry
 
 //-----------------------------------------------------------------------------
 // wxEntry


@@ -684,19 +639,23 @@ int wxEntry( int argc, char *argv[] )
 {
     gtk_set_locale();
 
 {
     gtk_set_locale();
 

+#if wxUSE_WCHAR_T

     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;
     if (!wxOKlibc()) wxConvCurrent = &wxConvLocal;

+#else
+    if (!wxOKlibc()) wxConvCurrent = (wxMBConv*) NULL;
+#endif

 
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );
 
     gtk_init( &argc, &argv );
 
     wxSetDetectableAutoRepeat( TRUE );

-    
+

     if (!wxApp::Initialize())
         return -1;
 
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,
     if (!wxApp::Initialize())
         return -1;
 
     if (!wxTheApp)
     {
         wxCHECK_MSG( wxApp::GetInitializerFunction(), -1,

-                     _T("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );
+                     wxT("wxWindows error: No initializer - use IMPLEMENT_APP macro.\n") );

 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 
 
         wxAppInitializerFunction app_ini = wxApp::GetInitializerFunction();
 


@@ -705,10 +664,20 @@ int wxEntry( int argc, char *argv[] )
         wxTheApp = (wxApp*) test_app;
     }
 
         wxTheApp = (wxApp*) test_app;
     }
 

-    wxCHECK_MSG( wxTheApp, -1, _T("wxWindows error: no application object") );
+    wxCHECK_MSG( wxTheApp, -1, wxT("wxWindows error: no application object") );

 
     wxTheApp->argc = argc;
 
     wxTheApp->argc = argc;

+#if wxUSE_UNICODE
+    wxTheApp->argv = new wxChar*[argc+1];
+    int mb_argc = 0;
+    while (mb_argc < argc) {
+      wxTheApp->argv[mb_argc] = wxStrdup(wxConvLibc.cMB2WX(argv[mb_argc]));
+      mb_argc++;
+    }
+    wxTheApp->argv[mb_argc] = (wxChar *)NULL;
+#else

     wxTheApp->argv = argv;
     wxTheApp->argv = argv;

+#endif

 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );
 
     wxString name(wxFileNameFromPath(argv[0]));
     wxStripExtension( name );


@@ -730,14 +699,14 @@ int wxEntry( int argc, char *argv[] )
     if ( retValue == 0 )
     {
         /* delete pending toplevel windows (typically a single
     if ( retValue == 0 )
     {
         /* delete pending toplevel windows (typically a single

-          dialog) so that, if there isn't any left, we don't
-          call OnRun() */
+           dialog) so that, if there isn't any left, we don't
+           call OnRun() */

         wxTheApp->DeletePendingObjects();
         wxTheApp->DeletePendingObjects();

-       
+

         wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
         if (wxTheApp->Initialized())
         wxTheApp->m_initialized = wxTopLevelWindows.GetCount() != 0;
 
         if (wxTheApp->Initialized())

-       {
+        {

             retValue = wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();
             retValue = wxTheApp->OnRun();
 
             wxWindow *topWindow = wxTheApp->GetTopWindow();


@@ -755,7 +724,7 @@ int wxEntry( int argc, char *argv[] )
                     delete topWindow;
                     wxTheApp->SetTopWindow( (wxWindow*) NULL );
                 }
                     delete topWindow;
                     wxTheApp->SetTopWindow( (wxWindow*) NULL );
                 }

-           }
+            }

             wxTheApp->OnExit();
         }
     }
             wxTheApp->OnExit();
         }
     }


@@ -779,31 +748,30 @@ int wxEntry( int argc, char *argv[] )
     return retValue;
 }
 
     return retValue;
 }
 

-#   include "wx/gtk/info.xpm"
-#   include "wx/gtk/error.xpm"
-#   include "wx/gtk/question.xpm"
-#   include "wx/gtk/warning.xpm"
-   
+#include "wx/gtk/info.xpm"
+#include "wx/gtk/error.xpm"
+#include "wx/gtk/question.xpm"
+#include "wx/gtk/warning.xpm"
+

 wxIcon
 wxApp::GetStdIcon(int which) const
 {
 wxIcon
 wxApp::GetStdIcon(int which) const
 {

-   switch(which)
-   {
-   case wxICON_INFORMATION:
-      return wxIcon(info_xpm);
-      break;
-   case wxICON_HAND:
-      return wxIcon(error_xpm);
-      break;
-   case wxICON_QUESTION:
-      return wxIcon(question_xpm);
-      break;
-   case wxICON_EXCLAMATION:
-      return wxIcon(warning_xpm);
-      break;
-   default:
-      wxFAIL_MSG("requested non existent standard icon");
-      return wxIcon(error_xpm);
-      break;
-   }
+    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(wxT("requested non existent standard icon"));
+            // still fall through
+
+        case wxICON_HAND:
+            return wxIcon(error_xpm);
+    }

 }
 }