1) corrected bug in log.cpp which only affected wxGTK: some messages could

   appear twice
2) tried to use gtk_widget_set_usize in wxFrame::SetSizeHints(), but it
   still doesn't work...

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 543e78e18d6ccd256333175e40f3e0f9edd739a6..1045d4c0ab5abcb4966736bf2ac3454d264ee059 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -384,7 +384,6 @@ void wxInitializeStockObjects ()
 void 
 wxDeleteStockObjects ()
 {
-
   wxDELETE(wxNORMAL_FONT);
   wxDELETE(wxSMALL_FONT);
   wxDELETE(wxITALIC_FONT);

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 94bf306c7401ca72b66ba0c7f999451db549d40f..e1840f24ad064b1372915710b15f1f3385ae3c1c 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -421,6 +421,9 @@ void wxLogGui::Flush()
   if ( !m_bHasMessages )
     return;
 
+  // do it right now to block any new calls to Flush() while we're here
+  m_bHasMessages = FALSE;
+  
   // @@@ ugly...
 
   // concatenate all strings (but not too many to not overfill the msg box)
@@ -449,7 +452,6 @@ void wxLogGui::Flush()
   }
 
   // no undisplayed messages whatsoever
-  m_bHasMessages =
   m_bErrors      = FALSE;
   m_aMessages.Empty();
 }

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 7791d8203e8e43016ac55e5306d37205ddd875a2..7424ec63fc7990b50094c47bdfe29c5064096253 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -269,7 +269,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
   m_width = width;
   m_height = height;
 
-  gtk_widget_set_usize( m_widget, width, height );
+  // VZ: why??
+  //gtk_widget_set_usize( m_widget, width, height );
 
   int main_x = 0;
   int main_y = 0;
@@ -514,10 +515,19 @@ void wxFrame::SetTitle( const wxString &title )
   gtk_window_set_title( GTK_WINDOW(m_widget), title );
 }
 
-void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+void wxFrame::SetSizeHints(int minW, int minH,
+                           int WXUNUSED(maxW), int WXUNUSED(maxH),
+                           int WXUNUSED(incW) )
 {
+  // gdk_window_set_hints alone doesn't really prevent the user from shrinking
+  // the window to the size smaller than (minW, minH)
+  gtk_widget_set_usize( GTK_WIDGET(m_widget), minW, minH );
+
+  /*
   gdk_window_set_hints( m_widget->window, -1, -1, 
-                       minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+                             minW, minH, maxW, maxH,
+                        GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE );
+  */
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 7791d8203e8e43016ac55e5306d37205ddd875a2..7424ec63fc7990b50094c47bdfe29c5064096253 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -269,7 +269,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
   m_width = width;
   m_height = height;
 
-  gtk_widget_set_usize( m_widget, width, height );
+  // VZ: why??
+  //gtk_widget_set_usize( m_widget, width, height );
 
   int main_x = 0;
   int main_y = 0;
@@ -514,10 +515,19 @@ void wxFrame::SetTitle( const wxString &title )
   gtk_window_set_title( GTK_WINDOW(m_widget), title );
 }
 
-void wxFrame::SetSizeHints(int minW, int minH, int maxW, int maxH, int WXUNUSED(incW) )
+void wxFrame::SetSizeHints(int minW, int minH,
+                           int WXUNUSED(maxW), int WXUNUSED(maxH),
+                           int WXUNUSED(incW) )
 {
+  // gdk_window_set_hints alone doesn't really prevent the user from shrinking
+  // the window to the size smaller than (minW, minH)
+  gtk_widget_set_usize( GTK_WIDGET(m_widget), minW, minH );
+
+  /*
   gdk_window_set_hints( m_widget->window, -1, -1, 
-                       minW, minH, maxW, maxH, GDK_HINT_MIN_SIZE | GDK_HINT_MIN_SIZE );
+                             minW, minH, maxW, maxH,
+                        GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE );
+  */
 }
 
 void wxFrame::SetIcon( const wxIcon &icon )