wxFrame::GetClientSize -> DoGetClientSize

Minor wxDialog fix


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/gtk1/dialog.cpp

@@ -575,6 +575,8 @@ void wxDialog::SetIcon( const wxIcon &icon )
     m_icon = icon;
     if (!icon.Ok()) return;
 
+    if (!m_widget->window) return;
+
     wxMask *mask = icon.GetMask();
     GdkBitmap *bm = (GdkBitmap *) NULL;
     if (mask) bm = mask->GetBitmap();

src/gtk1/frame.cpp

@@ -538,11 +538,11 @@ void wxFrame::Centre( int direction )
     Move( x, y );
 }
 
-void wxFrame::GetClientSize( int *width, int *height ) const
+void wxFrame::DoGetClientSize( int *width, int *height ) const
 {
     wxASSERT_MSG( (m_widget != NULL), _T("invalid frame") );
 
-    wxWindow::GetClientSize( width, height );
+    wxWindow::DoGetClientSize( width, height );
     if (height)
     {
         /* menu bar */