[ 1216436 ] cleanup 'shadow variable' warnings from gcc in headers.

[wxWidgets.git] / src / gtk / window.cpp

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index fd76da760fcf3b421a7ccf71c394f73879c6c801..950f84f25afb1bb1cdf119d445ff12792e06bb15 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -507,7 +507,7 @@ void wxgtk_combo_size_request_callback(GtkWidget *widget,
         (gcombo->button, &entry_req );
     
     requisition->width = w - entry_req.width;
-    requisition->height = entry_req.height+4;  // TODO: why +4?
+    requisition->height = entry_req.height;
 }
 }
 
@@ -4370,7 +4370,8 @@ void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style)
 {
     if (m_wxwindow)
         gtk_widget_modify_style(m_wxwindow, style);
-    gtk_widget_modify_style(m_widget, style);
+    else
+        gtk_widget_modify_style(m_widget, style);
 }
 
 bool wxWindowGTK::SetBackgroundStyle(wxBackgroundStyle style)