Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv26194
Modified Files:
wxDialogLayout.cpp
Log Message:
SetSizeHints call specifies a size bigger than the screen, which is wrong for
all wxWidgets ports but apparently only causes problems under Motif (SF patch
1462719)
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -b -u -2 -r1.120 -r1.121
--- wxDialogLayout.cpp 16 Jan 2006 20:32:27 -0000 1.120
+++ wxDialogLayout.cpp 26 May 2006 10:37:16 -0000 1.121
@@ -1108,8 +1108,8 @@
bool setAsMinimalSizeToo)
{
- if ( !LastSizeRestored() )
+ int heightInitital;
+ if ( !LastSizeRestored() || setAsMinimalSizeToo )
{
int heightScreen = (9*wxGetDisplaySize().y) / 10;
- int heightInitital;
if ( height > heightScreen )
{
@@ -1121,5 +1121,8 @@
heightInitital = height;
}
+ }
+ if ( !LastSizeRestored() )
+ {
SetClientSize(width, heightInitital);
@@ -1132,7 +1135,7 @@
// big for the screen - but still set some minimal height to prevent it
// from being shrunk to nothing at all
- SetSizeHints(width, wxMin(height, 40*hBtn));
+ SetSizeHints(width, wxMin(heightInitital, 40*hBtn));
- m_sizeMin = wxSize(width, height);
+ m_sizeMin = wxSize(width, heightInitital);
}
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
