Fix UseUintMax definition used by wxAny for VC6.

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

diff --git a/src/palmos/msgdlg.cpp b/src/palmos/msgdlg.cpp
index 4c1f7732b5043df2e1b52ed089f63613824ffd40..48445b23c5dc7a9a8bc62a4b65f3f8e97918b322 100644 (file)
--- a/src/palmos/msgdlg.cpp
+++ b/src/palmos/msgdlg.cpp
@@ -23,23 +23,16 @@
     #include "wx/msgdlg.h"
 #endif
 
     #include "wx/msgdlg.h"
 #endif
 

+#ifdef __WXPALMOS6__

 #include <Loader.h>
 #include <Loader.h>

+#else // __WXPALMOS5__
+#include <UIResources.h> // alertRscType
+#endif
+

 #include <Form.h>
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 
 #include <Form.h>
 
 IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
 

-wxMessageDialog::wxMessageDialog(wxWindow *parent,
-                                 const wxString& message,
-                                 const wxString& caption,
-                                 long style,
-                                 const wxPoint& WXUNUSED(pos))
-{
-    m_caption = caption;
-    m_message = message;
-    m_parent = parent;
-    SetMessageDialogStyle(style);
-}
-

 int wxMessageDialog::ShowModal()
 {
     int AlertID=1000;
 int wxMessageDialog::ShowModal()
 {
     int AlertID=1000;


@@ -47,9 +40,11 @@ int wxMessageDialog::ShowModal()
     int wxResult=wxID_OK;
     const long style = GetMessageDialogStyle();
 
     int wxResult=wxID_OK;
     const long style = GetMessageDialogStyle();
 

+#ifdef __WXPALMOS6__

     // Handle to the currently running application database
     DmOpenRef    AppDB;
     SysGetModuleDatabase(SysGetRefNum(), NULL, &AppDB);
     // Handle to the currently running application database
     DmOpenRef    AppDB;
     SysGetModuleDatabase(SysGetRefNum(), NULL, &AppDB);

+#endif // __WXPALMOS6__

 
     // Translate wx styles into Palm OS styles
     if (style & wxYES_NO)
 
     // Translate wx styles into Palm OS styles
     if (style & wxYES_NO)


@@ -83,7 +78,7 @@ int wxMessageDialog::ShowModal()
     // Get the alert resource
     char *AlertPtr;
     MemHandle AlertHandle;
     // Get the alert resource
     char *AlertPtr;
     MemHandle AlertHandle;

-    AlertHandle=DmGetResource(AppDB,'Talt',AlertID);
+    AlertHandle = POS_DmGetResource (AppDB, alertRscType, AlertID);

 
     AlertPtr=(char *)MemHandleLock(AlertHandle);
     AlertPtr+=8;
 
     AlertPtr=(char *)MemHandleLock(AlertHandle);
     AlertPtr+=8;


@@ -111,7 +106,7 @@ int wxMessageDialog::ShowModal()
     DmReleaseResource(AlertHandle);
 
     // Display the dialog
     DmReleaseResource(AlertHandle);
 
     // Display the dialog

-    Result=FrmCustomAlert(AppDB,AlertID,m_message.c_str(),"","");
+    Result = POS_FrmCustomAlert (AppDB, AlertID, m_message.c_str(), "", "");

 
     // Convert the Palm OS result to wxResult
     if(AlertID<1100)
 
     // Convert the Palm OS result to wxResult
     if(AlertID<1100)