fixes for harmless mingw32 warnings

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index f9ecd46ff932b646561caf2603c4af2555e0c782..f2f96611f8fab476adc5127ee343d29619b542da 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "cmndata.h"
 #endif
 
     #pragma implementation "cmndata.h"
 #endif
 


@@ -51,7 +51,7 @@
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
     #include <windowsx.h>
     #include "wx/msw/private.h"
 

-    #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE
+    #ifndef __SMARTPHONE__

         #include <commdlg.h>
     #endif
 
         #include <commdlg.h>
     #endif
 


@@ -88,12 +88,9 @@
 
 wxColourData::wxColourData()
 {
 
 wxColourData::wxColourData()
 {

-    int i;
-    for (i = 0; i < 16; i++)
-        m_custColours[i].Set(255, 255, 255);
-
-    m_chooseFull = FALSE;
+    m_chooseFull = false;

     m_dataColour.Set(0,0,0);
     m_dataColour.Set(0,0,0);

+    // m_custColours are wxNullColours initially

 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)


@@ -108,16 +105,15 @@ wxColourData::~wxColourData()
 
 void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {
 
 void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {

-    if (i > 15 || i < 0)
-        return;
+    wxCHECK_RET( (i >= 0 && i < 16), _T("custom colour index out of range") );

 
     m_custColours[i] = colour;
 }
 
 wxColour wxColourData::GetCustomColour(int i)
 {
 
     m_custColours[i] = colour;
 }
 
 wxColour wxColourData::GetCustomColour(int i)
 {

-    if (i > 15 || i < 0)
-        return wxColour(0,0,0);
+    wxCHECK_MSG( (i >= 0 && i < 16), wxColour(0,0,0),
+                 _T("custom colour index out of range") );

 
     return m_custColours[i];
 }
 
     return m_custColours[i];
 }


@@ -141,9 +137,9 @@ wxFontData::wxFontData()
     // Intialize colour to black.
     m_fontColour = wxNullColour;
 
     // Intialize colour to black.
     m_fontColour = wxNullColour;
 

-    m_showHelp = FALSE;
-    m_allowSymbols = TRUE;
-    m_enableEffects = TRUE;
+    m_showHelp = false;
+    m_allowSymbols = true;
+    m_enableEffects = true;

     m_minSize = 0;
     m_maxSize = 0;
 
     m_minSize = 0;
     m_maxSize = 0;
 


@@ -177,11 +173,11 @@ wxPrintData::wxPrintData()
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;

-    m_printCollate = FALSE;
+    m_printCollate = false;

 
     // New, 24/3/99
     m_printerName = wxT("");
 
     // New, 24/3/99
     m_printerName = wxT("");

-    m_colour = TRUE;
+    m_colour = true;

     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_paperId = wxPAPER_A4;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_paperId = wxPAPER_A4;


@@ -213,6 +209,10 @@ wxPrintData::wxPrintData()
     m_printerTranslateX = 0;
     m_printerTranslateY = 0;
     m_printMode = wxPRINT_MODE_FILE;
     m_printerTranslateX = 0;
     m_printerTranslateY = 0;
     m_printMode = wxPRINT_MODE_FILE;

+
+#ifdef wxUSE_STREAMS
+    m_outputstream = NULL;
+#endif

 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)


@@ -386,10 +386,8 @@ void wxPrintData::ConvertToNative()
 
         //// Collation
 
 
         //// Collation
 

-#ifndef __WIN16__

         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;

-#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


@@ -512,15 +510,13 @@ void wxPrintData::ConvertFromNative()
 
         //// Collation
 
 
         //// Collation
 

-#ifndef __WIN16__

         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)

-                m_printCollate = TRUE;
+                m_printCollate = true;

             else
             else

-                m_printCollate = FALSE;
+                m_printCollate = false;

         }
         }

-#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


@@ -541,12 +537,12 @@ void wxPrintData::ConvertFromNative()
         if (devMode->dmFields & DM_COLOR)
         {
             if (devMode->dmColor == DMCOLOR_COLOR)
         if (devMode->dmFields & DM_COLOR)
         {
             if (devMode->dmColor == DMCOLOR_COLOR)

-                m_colour = TRUE;
+                m_colour = true;

             else
             else

-                m_colour = FALSE;
+                m_colour = false;

         }
         else
         }
         else

-            m_colour = TRUE;
+            m_colour = true;

 
         //// Paper size
 
 
         //// Paper size
 


@@ -712,6 +708,9 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_printQuality = data.m_printQuality;
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_printQuality = data.m_printQuality;
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;

+#ifdef wxUSE_STREAMS
+    m_outputstream = data.m_outputstream;
+#endif

 
     // PostScript-specific data
     m_printerCommand = data.m_printerCommand;
 
     // PostScript-specific data
     m_printerCommand = data.m_printerCommand;


@@ -733,7 +732,7 @@ bool wxPrintData::Ok() const
     ((wxPrintData*)this)->ConvertToNative();
     return (m_devMode != NULL) ;
 #else
     ((wxPrintData*)this)->ConvertToNative();
     return (m_devMode != NULL) ;
 #else

-    return TRUE;
+    return true;

 #endif
 }
 
 #endif
 }
 


@@ -751,15 +750,15 @@ wxPrintDialogData::wxPrintDialogData()
     m_printMinPage = 0;
     m_printMaxPage = 0;
     m_printNoCopies = 1;
     m_printMinPage = 0;
     m_printMaxPage = 0;
     m_printNoCopies = 1;

-    m_printAllPages = FALSE;
-    m_printCollate = FALSE;
-    m_printToFile = FALSE;
-    m_printSelection = FALSE;
-    m_printEnableSelection = FALSE;
-    m_printEnablePageNumbers = TRUE;
-    m_printEnablePrintToFile = TRUE;
-    m_printEnableHelp = FALSE;
-    m_printSetupDialog = FALSE;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+    m_printEnablePrintToFile = true;
+    m_printEnableHelp = false;
+    m_printSetupDialog = false;

 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)


@@ -776,20 +775,20 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #endif
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #endif

-    m_printFromPage = 0;
+    m_printFromPage = 1;

     m_printToPage = 0;
     m_printToPage = 0;

-    m_printMinPage = 0;
-    m_printMaxPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;

     m_printNoCopies = 1;
     m_printNoCopies = 1;

-    m_printAllPages = FALSE;
-    m_printCollate = FALSE;
-    m_printToFile = FALSE;
-    m_printSelection = FALSE;
-    m_printEnableSelection = FALSE;
-    m_printEnablePageNumbers = TRUE;
-    m_printEnablePrintToFile = TRUE;
-    m_printEnableHelp = FALSE;
-    m_printSetupDialog = FALSE;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+    m_printEnablePrintToFile = true;
+    m_printEnableHelp = false;
+    m_printSetupDialog = false;

 
     m_printData = printData;
 }
 
     m_printData = printData;
 }


@@ -897,7 +896,7 @@ void wxPrintDialogData::ConvertToNative()
         pd->Flags |= PD_NOSELECTION;
     if ( !m_printEnablePageNumbers )
         pd->Flags |= PD_NOPAGENUMS;
         pd->Flags |= PD_NOSELECTION;
     if ( !m_printEnablePageNumbers )
         pd->Flags |= PD_NOPAGENUMS;

-    else if ( (!m_printAllPages) && (!m_printSelection) )
+    else if ( (!m_printAllPages) && (!m_printSelection) && (m_printFromPage != 0) && (m_printToPage != 0))

         pd->Flags |= PD_PAGENUMS;
     if ( m_printEnableHelp )
         pd->Flags |= PD_SHOWHELP;
         pd->Flags |= PD_PAGENUMS;
     if ( m_printEnableHelp )
         pd->Flags |= PD_SHOWHELP;


@@ -936,7 +935,7 @@ void wxPrintDialogData::ConvertFromNative()
     }
 
     // Now convert the DEVMODE object, passed down from the PRINTDLG object,
     }
 
     // Now convert the DEVMODE object, passed down from the PRINTDLG object,

-    // into wxWindows form.
+    // into wxWidgets form.

     m_printData.ConvertFromNative();
 
     m_printFromPage = pd->nFromPage;
     m_printData.ConvertFromNative();
 
     m_printFromPage = pd->nFromPage;


@@ -1045,13 +1044,13 @@ wxPageSetupDialogData::wxPageSetupDialogData()
     m_marginBottomRight = wxPoint(0, 0);
 
     // Flags
     m_marginBottomRight = wxPoint(0, 0);
 
     // Flags

-    m_defaultMinMargins = FALSE;
-    m_enableMargins = TRUE;
-    m_enableOrientation = TRUE;
-    m_enablePaper = TRUE;
-    m_enablePrinter = TRUE;
-    m_enableHelp = FALSE;
-    m_getDefaultInfo = FALSE;
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;

 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)


@@ -1075,13 +1074,13 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
     m_marginBottomRight = wxPoint(0, 0);
 
     // Flags
     m_marginBottomRight = wxPoint(0, 0);
 
     // Flags

-    m_defaultMinMargins = FALSE;
-    m_enableMargins = TRUE;
-    m_enableOrientation = TRUE;
-    m_enablePaper = TRUE;
-    m_enablePrinter = TRUE;
-    m_enableHelp = FALSE;
-    m_getDefaultInfo = FALSE;
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;

 
     m_printData = printData;
 
 
     m_printData = printData;