wxControl::SetLabel no longer strips out codes so do it here

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

diff --git a/src/palmos/msgdlg.cpp b/src/palmos/msgdlg.cpp
index e06a12c1268be39ecc49b1ab226adbaebffb7112..12c15eb45f5ac22276dc73e379fac3275f2b9916 100644 (file)
--- a/src/palmos/msgdlg.cpp
+++ b/src/palmos/msgdlg.cpp
@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "msgdlg.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,6 +24,9 @@
     #include "wx/msgdlg.h"
 #endif
 
+#include <Loader.h>
+#include <Form.h>
+
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 wxMessageDialog::wxMessageDialog(wxWindow *parent,
@@ -36,19 +35,10 @@ wxMessageDialog::wxMessageDialog(wxWindow *parent,
                                  long style,
                                  const wxPoint& WXUNUSED(pos))
 {
-#ifdef __WXDEBUG__
-    // check for common programming errors
-    if ( (style & wxID_OK) == wxID_OK )
-    {
-        // programmer probably confused wxID_OK with wxOK. Correct one is wxOK.
-        wxFAIL_MSG( _T("wxMessageBox: Did you mean wxOK (and not wxID_OK)?") );
-    }
-#endif // __WXDEBUG__
-
     m_caption = caption;
     m_message = message;
-    m_dialogStyle = style;
     m_parent = parent;
+    SetMessageDialogStyle(style);
 }
 
 int wxMessageDialog::ShowModal()
@@ -56,35 +46,36 @@ int wxMessageDialog::ShowModal()
     int AlertID=1000;
     int Result=0;
     int wxResult=wxID_OK;
+    const long style = GetMessageDialogStyle();
 
     // Handle to the currently running application database
     DmOpenRef    AppDB;
     SysGetModuleDatabase(SysGetRefNum(), NULL, &AppDB);
 
     // Translate wx styles into Palm OS styles
-    if (m_dialogStyle & wxYES_NO)
+    if (style & wxYES_NO)
     {
-        if (m_dialogStyle & wxCANCEL)
+        if (style & wxCANCEL)
             AlertID=1300; // Yes No Cancel
         else
             AlertID=1200; // Yes No
     }
-    if (m_dialogStyle & wxOK)
+    if (style & wxOK)
     {
-        if (m_dialogStyle & wxCANCEL)
+        if (style & wxCANCEL)
             AlertID=1100; // Ok Cancel
         else
             AlertID=1000; // Ok
     }
 
     // Add the icon styles
-    if (m_dialogStyle & wxICON_EXCLAMATION)
+    if (style & wxICON_EXCLAMATION)
         AlertID=AlertID+0; // Warning
-    else if (m_dialogStyle & wxICON_HAND)
+    else if (style & wxICON_HAND)
         AlertID=AlertID+1; // Error
-    else if (m_dialogStyle & wxICON_INFORMATION)
+    else if (style & wxICON_INFORMATION)
         AlertID=AlertID+2; // Information
-    else if (m_dialogStyle & wxICON_QUESTION)
+    else if (style & wxICON_QUESTION)
         AlertID=AlertID+3; // Confirmation
 
     // The Palm OS Dialog API does not support custom titles in a dialog box.