Moved more code from wxDataViewCtrl to wxDataViewCtrlInternal.

[wxWidgets.git] / src / palmos / dialog.cpp

diff --git a/src/palmos/dialog.cpp b/src/palmos/dialog.cpp
index c368c78f564da6d59423646e858ff3fa7f373d6e..4358cfef5f4f56fc7400af2e89bd54580e67b079 100644 (file)
--- a/src/palmos/dialog.cpp
+++ b/src/palmos/dialog.cpp
@@ -36,7 +36,7 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"

 
 // ----------------------------------------------------------------------------
 // wxWin macros
 
 // ----------------------------------------------------------------------------
 // wxWin macros


@@ -161,11 +161,6 @@ wxDialog::~wxDialog()
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
 // showing the dialogs
 // ----------------------------------------------------------------------------
 

-wxWindow *wxDialog::FindSuitableParent() const
-{
-    return NULL;
-}
-

 bool wxDialog::Show(bool show)
 {
     if (show && CanDoLayoutAdaptation())
 bool wxDialog::Show(bool show)
 {
     if (show && CanDoLayoutAdaptation())


@@ -181,8 +176,7 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
 // show dialog modally
 int wxDialog::ShowModal()
 {

-    if (show && CanDoLayoutAdaptation())
-        DoLayoutAdaptation();
+    Show (true);

 
     if (errNone == FrmDoDialog ((FormType *)wxTopLevelWindow::GetForm())) {
         return 0;
 
     if (errNone == FrmDoDialog ((FormType *)wxTopLevelWindow::GetForm())) {
         return 0;