projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AK! TYPO!
[wxWidgets.git]
/
src
/
common
/
cmndata.cpp
diff --git
a/src/common/cmndata.cpp
b/src/common/cmndata.cpp
index e9d1a56c7530009304273de4a28e76e599c76232..0595eacc2720b912c74e51d77fff3901787720ac 100644
(file)
--- a/
src/common/cmndata.cpp
+++ b/
src/common/cmndata.cpp
@@
-17,7
+17,7
@@
// headers
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "cmndata.h"
#endif
#pragma implementation "cmndata.h"
#endif
@@
-48,13
+48,12
@@
#endif // wxUSE_PRINTING_ARCHITECTURE
#ifdef __WXMSW__
#endif // wxUSE_PRINTING_ARCHITECTURE
#ifdef __WXMSW__
- #include <windows.h>
+ #include <windows
x
.h>
#include "wx/msw/private.h"
#include "wx/msw/private.h"
- #if !defined(__WIN32__)
- #include <print.h>
+ #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE
#include <commdlg.h>
#include <commdlg.h>
- #endif
// Win16
+ #endif
#if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
#include <windowsx.h>
#if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
#include <windowsx.h>
@@
-91,10
+90,10
@@
wxColourData::wxColourData()
{
int i;
for (i = 0; i < 16; i++)
{
int i;
for (i = 0; i < 16; i++)
- custColours[i].Set(255, 255, 255);
+
m_
custColours[i].Set(255, 255, 255);
- chooseFull = FALSE;
- dataColour.Set(0,0,0);
+
m_
chooseFull = FALSE;
+
m_
dataColour.Set(0,0,0);
}
wxColourData::wxColourData(const wxColourData& data)
}
wxColourData::wxColourData(const wxColourData& data)
@@
-112,7
+111,7
@@
void wxColourData::SetCustomColour(int i, const wxColour& colour)
if (i > 15 || i < 0)
return;
if (i > 15 || i < 0)
return;
- custColours[i] = colour;
+
m_
custColours[i] = colour;
}
wxColour wxColourData::GetCustomColour(int i)
}
wxColour wxColourData::GetCustomColour(int i)
@@
-120,17
+119,17
@@
wxColour wxColourData::GetCustomColour(int i)
if (i > 15 || i < 0)
return wxColour(0,0,0);
if (i > 15 || i < 0)
return wxColour(0,0,0);
- return custColours[i];
+ return
m_
custColours[i];
}
void wxColourData::operator=(const wxColourData& data)
{
int i;
for (i = 0; i < 16; i++)
}
void wxColourData::operator=(const wxColourData& data)
{
int i;
for (i = 0; i < 16; i++)
-
custColours[i] = data.
custColours[i];
+
m_custColours[i] = data.m_
custColours[i];
-
dataColour = (wxColour&)data.
dataColour;
-
chooseFull = data.
chooseFull;
+
m_dataColour = (wxColour&)data.m_
dataColour;
+
m_chooseFull = data.m_
chooseFull;
}
// ----------------------------------------------------------------------------
}
// ----------------------------------------------------------------------------
@@
-140,13
+139,13
@@
void wxColourData::operator=(const wxColourData& data)
wxFontData::wxFontData()
{
// Intialize colour to black.
wxFontData::wxFontData()
{
// Intialize colour to black.
- fontColour = wxNullColour;
+
m_
fontColour = wxNullColour;
- showHelp = FALSE;
- allowSymbols = TRUE;
- enableEffects = TRUE;
- minSize = 0;
- maxSize = 0;
+
m_
showHelp = FALSE;
+
m_
allowSymbols = TRUE;
+
m_
enableEffects = TRUE;
+ m
_m
inSize = 0;
+ m
_m
axSize = 0;
m_encoding = wxFONTENCODING_SYSTEM;
}
m_encoding = wxFONTENCODING_SYSTEM;
}
@@
-327,7
+326,11
@@
void wxPrintData::ConvertToNative()
pd.lStructSize = 66;
#else
memset(&pd, 0, sizeof(PRINTDLG));
pd.lStructSize = 66;
#else
memset(&pd, 0, sizeof(PRINTDLG));
+#ifdef __WXWINCE__
+ pd.cbStruct = sizeof(PRINTDLG);
+#else
pd.lStructSize = sizeof(PRINTDLG);
pd.lStructSize = sizeof(PRINTDLG);
+#endif
#endif
pd.hwndOwner = (HWND)NULL;
#endif
pd.hwndOwner = (HWND)NULL;
@@
-773,10
+776,10
@@
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_printAllPages = FALSE;
m_printCollate = FALSE;
m_printNoCopies = 1;
m_printAllPages = FALSE;
m_printCollate = FALSE;
@@
-894,7
+897,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;