removed WXK_SPACE as duplicating the selection event, added theme text drawing patch

[wxWidgets.git] / src / mac / dcprint.cpp

diff --git a/src/mac/dcprint.cpp b/src/mac/dcprint.cpp
index d50e8b393318fb332f1e1afd47426adca86f7945..1f36616c8f394c3fabf9e8e56269c00b85d2e8bb 100644 (file)
--- a/src/mac/dcprint.cpp
+++ b/src/mac/dcprint.cpp
@@ -27,6 +27,9 @@
 #include "wx/msgdlg.h"
 #include <math.h>
 #include "wx/mac/uma.h"
 #include "wx/msgdlg.h"
 #include <math.h>
 #include "wx/mac/uma.h"

+#ifndef __DARWIN__
+#include "Printing.h"
+#endif

 
 #if defined(TARGET_CARBON) && !defined(__DARWIN__)
 #  if PM_USE_SESSION_APIS
 
 #if defined(TARGET_CARBON) && !defined(__DARWIN__)
 #  if PM_USE_SESSION_APIS


@@ -57,7 +60,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        if ( err != noErr )
 #endif
        {
        if ( err != noErr )
 #endif
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
 #if TARGET_CARBON && PM_USE_SESSION_APIS
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
 #if TARGET_CARBON && PM_USE_SESSION_APIS


@@ -78,7 +81,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PrError() ;
        if ( err != noErr )
        {
        err = PrError() ;
        if ( err != noErr )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;


@@ -90,7 +93,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PrError() ;
        if ( err )
        {
        err = PrError() ;
        if ( err )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                UMAPrClose(NULL) ;


@@ -114,7 +117,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
     if ( err != noErr || m_macPrintSessionPort == kPMNoReference )
   #endif
     {
     if ( err != noErr || m_macPrintSessionPort == kPMNoReference )
   #endif
     {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS


@@ -136,7 +139,7 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
        err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err != noErr )
     {
        err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err != noErr )
     {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if TARGET_CARBON && PM_USE_SESSION_APIS


@@ -175,7 +178,7 @@ wxPrinterDC::~wxPrinterDC(void)
                }
                else
                {
                }
                else
                {

-                       message.Printf( "Print Error %d", err ) ;
+                       message.Printf( "Print Error %ld", err ) ;

                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
                }
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
                }


@@ -193,7 +196,7 @@ wxPrinterDC::~wxPrinterDC(void)
   #endif
        if ( err != noErr )
        {
   #endif
        if ( err != noErr )
        {

-                       message.Printf( "Print Error %d", err ) ;
+                       message.Printf( "Print Error %ld", err ) ;

                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
        }
                        wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                    dialog.ShowModal();
        }


@@ -249,7 +252,7 @@ void wxPrinterDC::StartPage(void)
        err = PrError() ;
        if ( err != noErr )
        {
        err = PrError() ;
        if ( err != noErr )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrClosePage( (TPPrPort) m_macPrintSessionPort ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrClosePage( (TPPrPort) m_macPrintSessionPort ) ;


@@ -268,7 +271,7 @@ void wxPrinterDC::StartPage(void)
   #endif
        if ( err != noErr )
        {
   #endif
        if ( err != noErr )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS


@@ -299,7 +302,7 @@ void wxPrinterDC::EndPage(void)
        err = PrError() ;
        if ( err != noErr )
        {
        err = PrError() ;
        if ( err != noErr )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
                ::PrCloseDoc( (TPPrPort) m_macPrintSessionPort  ) ;


@@ -315,7 +318,7 @@ void wxPrinterDC::EndPage(void)
   #endif
        if ( err != noErr )
        {
   #endif
        if ( err != noErr )
        {

-               message.Printf( "Print Error %d", err ) ;
+               message.Printf( "Print Error %ld", err ) ;

                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS
                wxMessageDialog dialog( NULL , message , "", wxICON_HAND | wxOK) ;
                dialog.ShowModal();
   #if PM_USE_SESSION_APIS