Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv26708/src/gui
Modified Files:
wxDialogLayout.cpp
Log Message:
fix wxEnhancedPanel layout when not using scrolling; warning fixes for latest wxWin
Index: wxDialogLayout.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxDialogLayout.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -b -u -2 -r1.97 -r1.98
--- wxDialogLayout.cpp 22 Jul 2003 22:01:40 -0000 1.97
+++ wxDialogLayout.cpp 22 Aug 2003 22:15:29 -0000 1.98
@@ -490,6 +490,10 @@
m_canvas = new wxEnhScrolledWindow(this);
}
- //else: no need for it... just use the panel directly (canvas is already
- // initialized to NULL above)
+ else
+ {
+ // no need for a separate canvas... just use the panel directly (canvas
+ // is already initialized to NULL above)
+ SetAutoLayout(true);
+ }
}
@@ -1298,5 +1302,6 @@
#endif // OS_WIN
- for ( int nPage = 0; nPage < m_notebook->GetPageCount(); nPage++ ) {
+ const int count = m_notebook->GetPageCount();
+ for ( int nPage = 0; nPage < count; nPage++ ) {
wxWindow *page = m_notebook->GetPage(nPage);
if ( !page->TransferDataToWindow() ) {
@@ -1324,5 +1329,6 @@
bool wxOptionsEditDialog::TransferDataFromWindow()
{
- for ( int nPage = 0; nPage < m_notebook->GetPageCount(); nPage++ )
+ const int count = m_notebook->GetPageCount();
+ for ( int nPage = 0; nPage < count; nPage++ )
{
if ( !m_notebook->GetPage(nPage)->TransferDataFromWindow() )
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines
at the same time. Free trial click here:http://www.vmware.com/wl/offer/358/0
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
