Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

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

diff --git a/src/palmos/printdlg.cpp b/src/palmos/printdlg.cpp
index aeba3d3ac6ab8c481700246faed10abdf8037794..bb60f7475998332f865c3b2e77393ee2cb759bdb 100644 (file)
--- a/src/palmos/printdlg.cpp
+++ b/src/palmos/printdlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        printdlg.cpp
+// Name:        src/palmos/printdlg.cpp

 // Purpose:     wxPrintDialog, wxPageSetupDialog
 // Purpose:     wxPrintDialog, wxPageSetupDialog

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "printdlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -34,10 +30,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/dcprint.h"

 #endif
 
 #include "wx/printdlg.h"
 #endif
 
 #include "wx/printdlg.h"

-#include "wx/dcprint.h"

 
 #include "wx/palmos/private.h"
 
 
 #include "wx/palmos/private.h"
 


@@ -84,7 +80,7 @@ int wxPrintDialog::ShowModal()
 
 wxDC *wxPrintDialog::GetPrintDC()
 {
 
 wxDC *wxPrintDialog::GetPrintDC()
 {

-    return (wxDC*) NULL;
+    return NULL;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------