Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
1998-08-16 21:02:14 +00:00
parent ff7b1510ea
commit d553992a3c
4 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/gdicmn.cpp
View File

@@ -384,7 +384,6 @@ void wxInitializeStockObjects ()
void void
wxDeleteStockObjects () wxDeleteStockObjects ()
{ {
wxDELETE(wxNORMAL_FONT); wxDELETE(wxNORMAL_FONT);
wxDELETE(wxSMALL_FONT); wxDELETE(wxSMALL_FONT);
wxDELETE(wxITALIC_FONT); wxDELETE(wxITALIC_FONT);

4
src/common/log.cpp
View File

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

16
src/gtk/frame.cpp
View File

@@ -269,7 +269,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_width = width; m_width = width;
m_height = height; 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_x = 0;
int main_y = 0; int main_y = 0;
@@ -514,10 +515,19 @@ void wxFrame::SetTitle( const wxString &title )
gtk_window_set_title( GTK_WINDOW(m_widget), 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, 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 ) void wxFrame::SetIcon( const wxIcon &icon )

16
src/gtk1/frame.cpp
View File

@@ -269,7 +269,8 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
m_width = width; m_width = width;
m_height = height; 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_x = 0;
int main_y = 0; int main_y = 0;
@@ -514,10 +515,19 @@ void wxFrame::SetTitle( const wxString &title )
gtk_window_set_title( GTK_WINDOW(m_widget), 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, 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 ) void wxFrame::SetIcon( const wxIcon &icon )