added wxMSW-specific wxEntryStart() overload taking WinMain-like parameters

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

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index 50cd4d41505ff30d390a97702e6e0ecb94db7093..ba996a4a9db47e5a6ad11d1e02b5cb78e73457a9 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -31,9 +31,9 @@
     #include "wx/dialog.h"
     #include "wx/timer.h"
     #include "wx/settings.h"
+    #include "wx/control.h"
 #endif
 
-#include "wx/control.h"
 #include "wx/gtk1/private.h"
 #include "wx/evtloop.h"
 
@@ -61,8 +61,6 @@ extern bool g_isIdle;
 // data
 // ----------------------------------------------------------------------------
 
-extern wxList           wxPendingDelete;
-
 extern int              g_openDialogs;
 extern wxWindowGTK     *g_delayedFocus;
 
@@ -329,7 +327,7 @@ gtk_frame_realized_callback( GtkWidget * WXUNUSED(widget),
 
     // reset the icon
     wxIconBundle iconsOld = win->GetIcons();
-    if ( iconsOld.GetIcon(-1).Ok() )
+    if ( !iconsOld.IsEmpty() )
     {
         win->SetIcon( wxNullIcon );
         win->SetIcons( iconsOld );
@@ -1088,17 +1086,15 @@ void wxTopLevelWindowGTK::SetTitle( const wxString &title )
     gtk_window_set_title( GTK_WINDOW(m_widget), wxGTK_CONV( title ) );
 }
 
-void wxTopLevelWindowGTK::SetIcon( const wxIcon &icon )
-{
-    SetIcons( wxIconBundle( icon ) );
-}
-
 void wxTopLevelWindowGTK::SetIcons( const wxIconBundle &icons )
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
     wxTopLevelWindowBase::SetIcons( icons );
 
+    if ( icons.IsEmpty() )
+        return;
+
     GdkWindow* window = m_widget->window;
     if (!window)
         return;