X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c067fe3c1e752658c63b4d556eb6a5468213860..3013861102292eb82391e361bee1dc090783c653:/src/palmos/dialog.cpp

diff --git a/src/palmos/dialog.cpp b/src/palmos/dialog.cpp
index 4538f533ec..4358cfef5f 100644
--- a/src/palmos/dialog.cpp
+++ b/src/palmos/dialog.cpp
@@ -24,8 +24,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dialog.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/dialog.h"
     #include "wx/utils.h"
     #include "wx/frame.h"
     #include "wx/app.h"
@@ -34,9 +35,8 @@
     #include "wx/log.h"
 #endif
 
-#include "wx/log.h"
 #include "wx/evtloop.h"
-#include "wx/ptr_scpd.h"
+#include "wx/scopedptr.h"
 
 // ----------------------------------------------------------------------------
 // wxWin macros
@@ -100,14 +100,6 @@ wxCONSTRUCTOR_6( wxDialog , wxWindow* , Parent , wxWindowID , Id , wxString , Ti
 IMPLEMENT_DYNAMIC_CLASS(wxDialog, wxTopLevelWindow)
 #endif
 
-BEGIN_EVENT_TABLE(wxDialog, wxDialogBase)
-    EVT_BUTTON(wxID_OK, wxDialog::OnOK)
-    EVT_BUTTON(wxID_APPLY, wxDialog::OnApply)
-    EVT_BUTTON(wxID_CANCEL, wxDialog::OnCancel)
-
-    EVT_CLOSE(wxDialog::OnCloseWindow)
-END_EVENT_TABLE()
-
 // ----------------------------------------------------------------------------
 // wxDialogModalData
 // ----------------------------------------------------------------------------
@@ -155,25 +147,26 @@ bool wxDialog::Create(wxWindow *parent,
                       long style,
                       const wxString& name)
 {
-    return false;
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return false;
+    return true;
 }
 
 wxDialog::~wxDialog()
 {
+    Show (false);
 }
 
 // ----------------------------------------------------------------------------
 // showing the dialogs
 // ----------------------------------------------------------------------------
 
-wxWindow *wxDialog::FindSuitableParent() const
-{
-    return NULL;
-}
-
 bool wxDialog::Show(bool show)
 {
-    return false;
+    if (show && CanDoLayoutAdaptation())
+        DoLayoutAdaptation();
+
+    return wxTopLevelWindowPalm::Show (show);
 }
 
 void wxDialog::Raise()
@@ -183,6 +176,11 @@ void wxDialog::Raise()
 // show dialog modally
 int wxDialog::ShowModal()
 {
+    Show (true);
+
+    if (errNone == FrmDoDialog ((FormType *)wxTopLevelWindow::GetForm())) {
+        return 0;
+    }
     return -1;
 }
 
@@ -190,23 +188,3 @@ void wxDialog::EndModal(int retCode)
 {
 }
 
-// ----------------------------------------------------------------------------
-// wxWin event handlers
-// ----------------------------------------------------------------------------
-
-// Standard buttons
-void wxDialog::OnOK(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxDialog::OnApply(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxDialog::OnCancel(wxCommandEvent& WXUNUSED(event))
-{
-}
-
-void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-}