From 078cf5cb756c4f4113d7acf04ebd6a2535ef75b3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Tue, 31 Aug 2004 12:38:46 +0000 Subject: [PATCH] Source cleaning: -1/wxID_ANY/wxNOT_FOUND, ::, TRUE/true, FALSE/false, whitespaces, tabs. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/notebook.h | 6 +++--- include/wx/msw/palette.h | 4 ++-- include/wx/msw/pen.h | 4 ++-- include/wx/msw/popupwin.h | 2 +- include/wx/msw/printwin.h | 2 +- include/wx/msw/private.h | 4 ++-- src/msw/nativdlg.cpp | 10 +++++----- src/msw/notebook.cpp | 30 +++++++++++++++--------------- src/msw/ownerdrw.cpp | 10 +++++----- src/msw/palette.cpp | 24 ++++++++++++------------ src/msw/pen.cpp | 10 +++++----- src/msw/penwin.cpp | 32 ++++++++++++++++---------------- src/msw/popupwin.cpp | 6 +++--- src/msw/printdlg.cpp | 14 +++++++------- src/msw/printwin.cpp | 2 +- 15 files changed, 80 insertions(+), 80 deletions(-) diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h index 6e19b04fa3..15ad5f884f 100644 --- a/include/wx/msw/notebook.h +++ b/include/wx/msw/notebook.h @@ -33,7 +33,7 @@ public : wxNotebookPageInfo() { m_page = NULL ; m_imageId = -1 ; m_selected = false ; } virtual ~wxNotebookPageInfo() { } - void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) + void Create( wxNotebookPage *page , const wxString &text , bool selected , int imageId ) { m_page = page ; m_text = text ; m_selected = selected ; m_imageId = imageId ; } wxNotebookPage* GetPage() const { return m_page ; } wxString GetText() const { return m_text ; } @@ -124,7 +124,7 @@ public: bool InsertPage(size_t nPage, wxNotebookPage *pPage, const wxString& strText, - bool bSelect = FALSE, + bool bSelect = false, int imageId = -1); void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; } @@ -158,7 +158,7 @@ public: virtual bool MSWTranslateMessage(WXMSG *wxmsg); #if wxUSE_CONSTRAINTS - virtual void SetConstraintSizes(bool recurse = TRUE); + virtual void SetConstraintSizes(bool recurse = true); virtual bool DoPhase(int nPhase); #endif // wxUSE_CONSTRAINTS diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h index 7a0270a6aa..47c8dc83c7 100644 --- a/include/wx/msw/palette.h +++ b/include/wx/msw/palette.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PALETTE_H_ @@ -52,7 +52,7 @@ public: inline bool operator == (const wxPalette& palette) const { return m_refData == palette.m_refData; } inline bool operator != (const wxPalette& palette) const { return m_refData != palette.m_refData; } - virtual bool FreeResource(bool force = FALSE); + virtual bool FreeResource(bool force = false); inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); } void SetHPALETTE(WXHPALETTE pal); diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h index e53c21f3bd..a81ee0a9e6 100644 --- a/include/wx/msw/pen.h +++ b/include/wx/msw/pen.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_PEN_H_ @@ -132,7 +132,7 @@ public: // Internal bool RealizeResource(); - bool FreeResource(bool force = FALSE); + bool FreeResource(bool force = false); WXHANDLE GetResourceHandle() const; bool IsFree() const; void Unshare(); diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h index 3a1f9f1732..53d6e0e37d 100644 --- a/include/wx/msw/popupwin.h +++ b/include/wx/msw/popupwin.h @@ -30,7 +30,7 @@ public: bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - virtual bool Show(bool show = TRUE); + virtual bool Show(bool show = true); protected: // popups handle the position like wxTopLevelWindow, not wxWindow diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h index f14cb044a4..6aef6a4d29 100644 --- a/include/wx/msw/printwin.h +++ b/include/wx/msw/printwin.h @@ -32,7 +32,7 @@ public: virtual bool Print(wxWindow *parent, wxPrintout *printout, - bool prompt = TRUE); + bool prompt = true); virtual wxDC* PrintDialog(wxWindow *parent); virtual bool Setup(wxWindow *parent); diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h index c7aebfc709..cef3f680db 100644 --- a/include/wx/msw/private.h +++ b/include/wx/msw/private.h @@ -138,11 +138,11 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT; #define STATIC_FLAGS (SS_LEFT|WS_CHILD|WS_VISIBLE) #define CHECK_CLASS wxT("BUTTON") #define CHECK_FLAGS (BS_AUTOCHECKBOX|WS_TABSTOP|WS_CHILD) -#define CHECK_IS_FAFA FALSE +#define CHECK_IS_FAFA FALSE #define RADIO_CLASS wxT("BUTTON") #define RADIO_FLAGS (BS_AUTORADIOBUTTON|WS_CHILD|WS_VISIBLE) #define RADIO_SIZE 20 -#define RADIO_IS_FAFA FALSE +#define RADIO_IS_FAFA FALSE #define PURE_WINDOWS #define GROUP_CLASS wxT("BUTTON") #define GROUP_FLAGS (BS_GROUPBOX|WS_CHILD|WS_VISIBLE) diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index 519176b336..fd61bcf8e2 100644 --- a/src/msw/nativdlg.cpp +++ b/src/msw/nativdlg.cpp @@ -61,7 +61,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id) (DLGPROC) wxDlgProc); if ( !m_hWnd ) - return FALSE; + return false; SubclassWin(GetHWND()); @@ -84,7 +84,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id) CreateWindowFromHWND(this, (WXHWND) hWndNext); } - return TRUE; + return true; } bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) @@ -98,7 +98,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) (DLGPROC)wxDlgProc); if ( !m_hWnd ) - return FALSE; + return false; SubclassWin(GetHWND()); @@ -121,7 +121,7 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name) CreateWindowFromHWND(this, (WXHWND) hWndNext); } - return TRUE; + return true; } // --------------------------------------------------------------------------- @@ -305,7 +305,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd) wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons.")); } #endif -#endif /* wxUSE_STATBMP */ +#endif /* wxUSE_STATBMP */ } #endif else diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index 7057d019ed..e08843e33b 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -126,7 +126,7 @@ wxBEGIN_FLAGS( wxNotebookStyle ) wxFLAGS_MEMBER(wxBORDER_RAISED) wxFLAGS_MEMBER(wxBORDER_STATIC) wxFLAGS_MEMBER(wxBORDER_NONE) - + // old style border flags wxFLAGS_MEMBER(wxSIMPLE_BORDER) wxFLAGS_MEMBER(wxSUNKEN_BORDER) @@ -173,7 +173,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxNotebook) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) +wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo) @@ -186,7 +186,7 @@ wxEND_PROPERTIES_TABLE() wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo) wxEND_HANDLERS_TABLE() -wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) +wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) #else IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl) @@ -255,14 +255,14 @@ bool wxNotebook::Create(wxWindow *parent, { if (style & wxNB_BOTTOM) style &= ~wxNB_BOTTOM; - + if (style & wxNB_LEFT) style &= ~wxNB_LEFT; - + if (style & wxNB_RIGHT) style &= ~wxNB_RIGHT; } - + if ( !CreateControl(parent, id, pos, size, style | wxTAB_TRAVERSAL, wxDefaultValidator, name) ) return false; @@ -323,7 +323,7 @@ int wxNotebook::GetRowCount() const int wxNotebook::SetSelection(size_t nPage) { - wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") ); + wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") ); if ( int(nPage) != m_nSelection ) { @@ -437,7 +437,7 @@ void wxNotebook::SetTabSize(const wxSize& sz) wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const { wxSize sizeTotal = sizePage; - + // We need to make getting tab size part of the wxWidgets API. wxSize tabSize(0, 0); if (GetPageCount() > 0) @@ -509,8 +509,8 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) if (selNew != -1) { // No selection change, just refresh the current selection. - // Because it could be that the slection index changed - // we need to update it. + // Because it could be that the slection index changed + // we need to update it. // Note: this does not mean the selection it self changed. m_nSelection = selNew; m_pages[m_nSelection]->Refresh(); @@ -518,13 +518,13 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage) else if (int(nPage) == m_nSelection) { // The selection was deleted. - + // Determine new selection. if (m_nSelection == int(GetPageCount())) selNew = m_nSelection - 1; else selNew = m_nSelection; - + // m_nSelection must be always valid so reset it before calling // SetSelection() m_nSelection = -1; @@ -577,11 +577,11 @@ bool wxNotebook::InsertPage(size_t nPage, if (!g_TestedForTheme) { int commCtrlVersion = wxTheApp->GetComCtl32Version() ; - + g_UseTheme = (commCtrlVersion >= 600); g_TestedForTheme = true; } - + // Automatically apply the theme background, // changing the colour of the panel to match the // tab page colour. This won't work well with all @@ -998,7 +998,7 @@ void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&) #if wxUSE_UXTHEME window->ApplyParentThemeBackground(colour); - + for ( wxWindowList::compatibility_iterator node = window->GetChildren().GetFirst(); node; node = node->GetNext() ) { wxWindow *child = node->GetData(); diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 6c3de9fd92..785db7f39e 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -121,7 +121,7 @@ wxOwnerDrawn::wxOwnerDrawn(const wxString& str, } m_bCheckable = bCheckable; - m_bOwnerDrawn = FALSE; + m_bOwnerDrawn = false; m_nHeight = 0; m_nMarginWidth = ms_nLastMarginWidth; m_nMinHeight = wxMSWSystemMenuFontModule::ms_systemMenuHeight; @@ -192,7 +192,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // remember height for use in OnDrawItem m_nHeight = *pheight; - return TRUE; + return true; } // draw the item @@ -203,7 +203,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, { // we do nothing on focus change if ( act == wxODFocusChanged ) - return TRUE; + return true; // this flag determines whether or not an edge will @@ -386,7 +386,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, dc.Blit(rc.x + (margin - nBmpWidth) / 2, rc.y + heightDiff / 2, nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY, TRUE /* use mask */); + &dcMem, 0, 0, wxCOPY, true /* use mask */); if ( st & wxODSelected && draw_bitmap_edge ) { RECT rectBmp = { rc.GetLeft(), rc.GetTop(), @@ -402,7 +402,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, ::SetTextColor(hdc, colOldText); ::SetBkColor(hdc, colOldBack); - return TRUE; + return true; } diff --git a/src/msw/palette.cpp b/src/msw/palette.cpp index 40573ae148..4a73bb28b2 100644 --- a/src/msw/palette.cpp +++ b/src/msw/palette.cpp @@ -57,7 +57,7 @@ wxPalette::wxPalette(int n, const unsigned char *red, const unsigned char *green wxPalette::~wxPalette(void) { -// FreeResource(TRUE); +// FreeResource(true); } bool wxPalette::FreeResource(bool WXUNUSED(force)) @@ -66,7 +66,7 @@ bool wxPalette::FreeResource(bool WXUNUSED(force)) { DeleteObject((HPALETTE)M_PALETTEDATA->m_hPalette); } - return TRUE; + return true; } bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue) @@ -75,7 +75,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre #if defined(__WXMICROWIN__) - return (FALSE); + return false; #else @@ -84,7 +84,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre NPLOGPALETTE npPal = (NPLOGPALETTE)LocalAlloc(LMEM_FIXED, sizeof(LOGPALETTE) + (WORD)n * sizeof(PALETTEENTRY)); if (!npPal) - return(FALSE); + return false; npPal->palVersion = 0x300; npPal->palNumEntries = n; @@ -99,7 +99,7 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre } M_PALETTEDATA->m_hPalette = (WXHPALETTE) CreatePalette((LPLOGPALETTE)npPal); LocalFree((HANDLE)npPal); - return TRUE; + return true; #endif } @@ -107,10 +107,10 @@ bool wxPalette::Create(int n, const unsigned char *red, const unsigned char *gre int wxPalette::GetPixel(const unsigned char red, const unsigned char green, const unsigned char blue) const { #ifdef __WXMICROWIN__ - return FALSE; + return 0; #else if ( !m_refData ) - return FALSE; + return 0; return ::GetNearestPaletteIndex((HPALETTE) M_PALETTEDATA->m_hPalette, PALETTERGB(red, green, blue)); #endif @@ -119,13 +119,13 @@ int wxPalette::GetPixel(const unsigned char red, const unsigned char green, cons bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsigned char *blue) const { #ifdef __WXMICROWIN__ - return FALSE; + return false; #else if ( !m_refData ) - return FALSE; + return false; if (index < 0 || index > 255) - return FALSE; + return false; PALETTEENTRY entry; if (::GetPaletteEntries((HPALETTE) M_PALETTEDATA->m_hPalette, index, 1, &entry)) @@ -133,9 +133,9 @@ bool wxPalette::GetRGB(int index, unsigned char *red, unsigned char *green, unsi *red = entry.peRed; *green = entry.peGreen; *blue = entry.peBlue; - return TRUE; + return true; } else - return FALSE; + return false; #endif } diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 7f1103f09b..618860ecdb 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -141,7 +141,7 @@ bool wxPen::RealizeResource() if (M_PENDATA->m_style==wxTRANSPARENT) { M_PENDATA->m_hPen = (WXHPEN) ::GetStockObject(NULL_PEN); - return TRUE; + return true; } COLORREF ms_colour = M_PENDATA->m_colour.GetPixel(); @@ -274,9 +274,9 @@ bool wxPen::RealizeResource() if (M_PENDATA->m_hPen==0) wxError("Cannot create pen","Internal error") ; #endif - return TRUE; + return true; } - return FALSE; + return false; } WXHANDLE wxPen::GetResourceHandle() const @@ -293,9 +293,9 @@ bool wxPen::FreeResource(bool WXUNUSED(force)) { DeleteObject((HPEN) M_PENDATA->m_hPen); M_PENDATA->m_hPen = 0; - return TRUE; + return true; } - else return FALSE; + else return false; } bool wxPen::IsFree() const diff --git a/src/msw/penwin.cpp b/src/msw/penwin.cpp index c43b5e6388..8a32c9f708 100644 --- a/src/msw/penwin.cpp +++ b/src/msw/penwin.cpp @@ -6,7 +6,7 @@ // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) @@ -57,32 +57,32 @@ void wxEnablePenAppHooks (bool hook) if (hook) { if (g_hPenWin) - return; + return; /////////////////////////////////////////////////////////////////////// // If running on a Pen Windows system, register this app so all // EDIT controls in dialogs are replaced by HEDIT controls. if ((g_hPenWin = (HANDLE)GetSystemMetrics (SM_PENWINDOWS)) != (HANDLE) NULL) - { - // We do this fancy GetProcAddress simply because we don't - // know if we're running Pen Windows. - if ((RegPenApp = (PENREGPROC)GetProcAddress (g_hPenWin, "RegisterPenApp")) != NULL) - (*RegPenApp) (RPA_DEFAULT, TRUE); - } + { + // We do this fancy GetProcAddress simply because we don't + // know if we're running Pen Windows. + if ((RegPenApp = (PENREGPROC)GetProcAddress (g_hPenWin, "RegisterPenApp")) != NULL) + (*RegPenApp) (RPA_DEFAULT, TRUE); + } } else { /////////////////////////////////////////////////////////////////////// // If running on a Pen Windows system, unregister if (g_hPenWin) - { - // Unregister this app - if (RegPenApp != NULL) - (*RegPenApp) (RPA_DEFAULT, FALSE); - g_hPenWin = (HANDLE) NULL; - } + { + // Unregister this app + if (RegPenApp != NULL) + (*RegPenApp) (RPA_DEFAULT, FALSE); + g_hPenWin = (HANDLE) NULL; + } } -#endif /* ! Windows-NT */ +#endif /* ! Windows-NT */ } #endif @@ -113,7 +113,7 @@ void wxCleanUpPenWin(void) if (g_hPenWin) { // Unregister this app if (RegPenApp != NULL) - (*RegPenApp)(RPA_DEFAULT, FALSE); + (*RegPenApp)(RPA_DEFAULT, FALSE); } #endif } diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp index aa340cdc9f..dcd2272474 100644 --- a/src/msw/popupwin.cpp +++ b/src/msw/popupwin.cpp @@ -50,7 +50,7 @@ bool wxPopupWindow::Create(wxWindow *parent, int flags) Hide(); return wxPopupWindowBase::Create(parent) && - wxWindow::Create(parent, -1, + wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, flags | wxPOPUP_WINDOW); } @@ -100,7 +100,7 @@ WXHWND wxPopupWindow::MSWGetParent() const bool wxPopupWindow::Show(bool show) { if ( !wxWindowMSW::Show(show) ) - return FALSE; + return false; if ( show ) { @@ -111,7 +111,7 @@ bool wxPopupWindow::Show(bool show) } } - return TRUE; + return true; } #endif // #if wxUSE_POPUPWIN diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index d3210c96b9..a2c894079b 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -68,7 +68,7 @@ wxPrintDialog::wxPrintDialog() { m_dialogParent = NULL; m_printerDC = NULL; - m_destroyDC = TRUE; + m_destroyDC = true; } wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data) @@ -89,14 +89,14 @@ bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data) { m_dialogParent = p; m_printerDC = NULL; - m_destroyDC = TRUE; + m_destroyDC = true; if ( data ) m_printDialogData = *data; m_printDialogData.SetOwnerWindow(p); - return TRUE; + return true; } wxPrintDialog::~wxPrintDialog() @@ -121,7 +121,7 @@ int wxPrintDialog::ShowModal() p->hwndOwner = 0; - if ( ret != FALSE && ((PRINTDLG *)m_printDialogData.GetNativeData())->hDC) + if ( ret != false && ((PRINTDLG *)m_printDialogData.GetNativeData())->hDC) { wxPrinterDC *pdc = new wxPrinterDC((WXHDC) ((PRINTDLG *)m_printDialogData.GetNativeData())->hDC); m_printerDC = pdc; @@ -138,7 +138,7 @@ wxDC *wxPrintDialog::GetPrintDC() { if (m_printerDC) { - m_destroyDC = FALSE; + m_destroyDC = false; return m_printerDC; } else @@ -169,7 +169,7 @@ bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data) #if defined(__WIN95__) m_pageSetupData.SetOwnerWindow(p); #endif - return TRUE; + return true; } wxPageSetupDialog::~wxPageSetupDialog() @@ -200,7 +200,7 @@ int wxPageSetupDialog::ShowModal() wxGenericPageSetupDialog *genericPageSetupDialog = new wxGenericPageSetupDialog(GetParent(), & m_pageSetupData); int ret = genericPageSetupDialog->ShowModal(); m_pageSetupData = genericPageSetupDialog->GetPageSetupData(); - genericPageSetupDialog->Close(TRUE); + genericPageSetupDialog->Close(true); return ret; #endif } diff --git a/src/msw/printwin.cpp b/src/msw/printwin.cpp index 80e1d2d484..451fbd99e7 100644 --- a/src/msw/printwin.cpp +++ b/src/msw/printwin.cpp @@ -417,7 +417,7 @@ LONG APIENTRY _EXPORT wxAbortProc(HDC WXUNUSED(hPr), int WXUNUSED(Code)) /* Process messages intended for the abort dialog box */ - while (!wxPrinterBase::sm_abortIt && PeekMessage(&msg, 0, 0, 0, TRUE)) + while (!wxPrinterBase::sm_abortIt && ::PeekMessage(&msg, 0, 0, 0, TRUE)) if (!IsDialogMessage((HWND) wxPrinterBase::sm_abortWindow->GetHWND(), &msg)) { TranslateMessage(&msg); DispatchMessage(&msg); -- 2.47.2