]> git.saurik.com Git - wxWidgets.git/commitdiff
Fit modeless preferences dialog to its contents too.
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 21 May 2013 23:17:29 +0000 (23:17 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 21 May 2013 23:17:29 +0000 (23:17 +0000)
When a preferences dialog is shown non-modally, it should still fit to the
contents of its pages, so move the code added for the modal case in r73624
to the base wxGenericPreferencesEditorImplBase class.

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

src/generic/preferencesg.cpp

index 231185beed2424b70375655a2cc6ae7df8df303b..65eeaa4b9d73f87b9a40ca90037f192638709629 100644 (file)
@@ -125,6 +125,8 @@ protected:
             dlg->AddPage(i->get());
         }
 
             dlg->AddPage(i->get());
         }
 
+        dlg->Fit();
+
         return dlg;
     }
 
         return dlg;
     }
 
@@ -207,8 +209,6 @@ public:
         m_dlg = dlg.get();
         wxON_BLOCK_EXIT_NULL(m_dlg);
 
         m_dlg = dlg.get();
         wxON_BLOCK_EXIT_NULL(m_dlg);
 
-        dlg->Fit();
-
         // Restore the previously selected page, if any.
         if ( m_currentPage != -1 )
             dlg->SelectPage(m_currentPage);
         // Restore the previously selected page, if any.
         if ( m_currentPage != -1 )
             dlg->SelectPage(m_currentPage);