From: Włodzimierz Skiba Date: Fri, 22 Jul 2005 17:13:46 +0000 (+0000) Subject: [1231183] 'cleanup: mismatched indentation' and other cleanings. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/92218ce60024b07e9ae5a5790a85582db083e55c [1231183] 'cleanup: mismatched indentation' and other cleanings. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/bitmap.cpp b/src/msw/bitmap.cpp index e41a8cf197..c77d7af44c 100644 --- a/src/msw/bitmap.cpp +++ b/src/msw/bitmap.cpp @@ -1091,7 +1091,7 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const #ifndef __WXMICROWIN__ // handle alpha channel, if any if (HasAlpha()) - ret.UseAlpha(); + ret.UseAlpha(); // copy bitmap data MemoryHDC dcSrc, diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 4079d054c3..46c4a0fc35 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -313,7 +313,7 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu) { int nCount = bar->GetMenuCount(); for (int n = 0; n < nCount; n++) - bar->GetMenu(n)->UpdateUI(source); + bar->GetMenu(n)->UpdateUI(source); } } } @@ -1381,7 +1381,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu) { success = true; break; - } + } if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) ) { diff --git a/src/msw/mimetype.cpp b/src/msw/mimetype.cpp index 7ff39b6427..3db2218e44 100644 --- a/src/msw/mimetype.cpp +++ b/src/msw/mimetype.cpp @@ -551,56 +551,57 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) key.SetValue(wxEmptyString, filetype); } + } + else + { + // key already exists, maybe we want to change it ?? + if (!filetypeOrig.empty()) + { + filetype = filetypeOrig; + key.SetValue(wxEmptyString, filetype); } else { - // key already exists, maybe we want to change it ?? - if (!filetypeOrig.empty()) - { - filetype = filetypeOrig; - key.SetValue(wxEmptyString, filetype); - } - else - { - key.QueryValue(wxEmptyString, filetype); - } + key.QueryValue(wxEmptyString, filetype); } - // now set a mimetypeif we have it, but ignore it if none - const wxString& mimetype = ftInfo.GetMimeType(); - if ( !mimetype.empty() ) + } + + // now set a mimetypeif we have it, but ignore it if none + const wxString& mimetype = ftInfo.GetMimeType(); + if ( !mimetype.empty() ) + { + // set the MIME type + ok = key.SetValue(_T("Content Type"), mimetype); + + if ( ok ) { - // set the MIME type - ok = key.SetValue(_T("Content Type"), mimetype); + // create the MIME key + wxString strKey = MIME_DATABASE_KEY; + strKey << mimetype; + wxRegKey keyMIME(wxRegKey::HKCR, strKey); + ok = keyMIME.Create(); if ( ok ) { - // create the MIME key - wxString strKey = MIME_DATABASE_KEY; - strKey << mimetype; - wxRegKey keyMIME(wxRegKey::HKCR, strKey); - ok = keyMIME.Create(); - - if ( ok ) - { - // and provide a back link to the extension - keyMIME.SetValue(_T("Extension"), extWithDot); - } + // and provide a back link to the extension + keyMIME.SetValue(_T("Extension"), extWithDot); } } + } // now make other extensions have the same filetype for (iExtCount=1; iExtCount < ftInfo.GetExtensionsCount(); iExtCount++ ) - { - ext = ftInfo.GetExtensions()[iExtCount]; - if ( ext[0u] != _T('.') ) - extWithDot = _T('.'); - extWithDot += ext; + { + ext = ftInfo.GetExtensions()[iExtCount]; + if ( ext[0u] != _T('.') ) + extWithDot = _T('.'); + extWithDot += ext; - wxRegKey key(wxRegKey::HKCR, extWithDot); - if ( !key.Exists() ) key.Create(); - key.SetValue(wxEmptyString, filetype); + wxRegKey key(wxRegKey::HKCR, extWithDot); + if ( !key.Exists() ) key.Create(); + key.SetValue(wxEmptyString, filetype); // now set any mimetypes we may have, but ignore it if none const wxString& mimetype = ftInfo.GetMimeType(); @@ -609,22 +610,21 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) // set the MIME type ok = key.SetValue(_T("Content Type"), mimetype); - if ( ok ) - { + if ( ok ) + { // create the MIME key wxString strKey = MIME_DATABASE_KEY; strKey << mimetype; wxRegKey keyMIME(wxRegKey::HKCR, strKey); ok = keyMIME.Create(); - if ( ok ) - { + if ( ok ) + { // and provide a back link to the extension keyMIME.SetValue(_T("Extension"), extWithDot); + } + } } - } - } - } // end of for loop; all extensions now point to HKCR\.ext\Default @@ -637,13 +637,14 @@ wxFileType *wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) if (ft) { - if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); - if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); - // chris: I don't like the ->m_impl-> here FIX this ?? - if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; - if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + if (! ftInfo.GetOpenCommand ().empty() ) ft->SetCommand (ftInfo.GetOpenCommand (), wxT("open" ) ); + if (! ftInfo.GetPrintCommand().empty() ) ft->SetCommand (ftInfo.GetPrintCommand(), wxT("print" ) ); + // chris: I don't like the ->m_impl-> here FIX this ?? + if (! ftInfo.GetDescription ().empty() ) ft->m_impl->SetDescription (ftInfo.GetDescription ()) ; + if (! ftInfo.GetIconFile().empty() ) ft->SetDefaultIcon (ftInfo.GetIconFile(), ftInfo.GetIconIndex() ); + + } - } return ft; } @@ -761,7 +762,7 @@ bool wxFileTypeImpl::Unassociate() result = false; if ( !RemoveMimeType() ) result = false; - if ( !RemoveDescription() ) + if ( !RemoveDescription() ) result = false; /* diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 6fa6d77340..fb83215f33 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -274,209 +274,216 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, wxODAction act, wxODStatus st) { - // we do nothing on focus change - if ( act == wxODFocusChanged ) - return true; + // we do nothing on focus change + if ( act == wxODFocusChanged ) + return true; - // this flag determines whether or not an edge will - // be drawn around the bitmap. In most "windows classic" - // applications, a 1-pixel highlight edge is drawn around - // the bitmap of an item when it is selected. However, - // with the new "luna" theme, no edge is drawn around - // the bitmap because the background is white (this applies - // only to "non-XP style" menus w/ bitmaps -- - // see IE 6 menus for an example) + // this flag determines whether or not an edge will + // be drawn around the bitmap. In most "windows classic" + // applications, a 1-pixel highlight edge is drawn around + // the bitmap of an item when it is selected. However, + // with the new "luna" theme, no edge is drawn around + // the bitmap because the background is white (this applies + // only to "non-XP style" menus w/ bitmaps -- + // see IE 6 menus for an example) - bool draw_bitmap_edge = true; + bool draw_bitmap_edge = true; - // set the colors - // -------------- - DWORD colBack, colText; - if ( st & wxODSelected ) { - colBack = GetSysColor(COLOR_HIGHLIGHT); - if (!(st & wxODDisabled)) + // set the colors + // -------------- + DWORD colBack, colText; + if ( st & wxODSelected ) { - colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + colBack = GetSysColor(COLOR_HIGHLIGHT); + if (!(st & wxODDisabled)) + { + colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + } + else + { + colText = GetSysColor(COLOR_GRAYTEXT); + } } - else + else { - colText = GetSysColor(COLOR_GRAYTEXT); + // fall back to default colors if none explicitly specified + colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack) + : GetSysColor(COLOR_MENU); + colText = m_colText.Ok() ? wxColourToPalRGB(m_colText) + : GetSysColor(COLOR_MENUTEXT); + } + + if ( IsOwnerDrawn() ) + { + // don't draw an edge around the bitmap, if background is white ... + DWORD menu_bg_color = GetSysColor(COLOR_MENU); + if ( ( GetRValue( menu_bg_color ) >= 0xf0 && + GetGValue( menu_bg_color ) >= 0xf0 && + GetBValue( menu_bg_color ) >= 0xf0 ) + ) + { + draw_bitmap_edge = false; + } } - } - else { - // fall back to default colors if none explicitly specified - colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack) - : GetSysColor(COLOR_MENU); - colText = m_colText.Ok() ? wxColourToPalRGB(m_colText) - : GetSysColor(COLOR_MENUTEXT); - } - - if ( IsOwnerDrawn() ) - { - // don't draw an edge around the bitmap, if background is white ... - DWORD menu_bg_color = GetSysColor(COLOR_MENU); - if ( ( GetRValue( menu_bg_color ) >= 0xf0 && - GetGValue( menu_bg_color ) >= 0xf0 && - GetBValue( menu_bg_color ) >= 0xf0 ) - ) + else // edge doesn't look well with default Windows drawing { draw_bitmap_edge = false; } - } - else // edge doesn't look well with default Windows drawing - { - draw_bitmap_edge = false; - } - - HDC hdc = GetHdcOf(dc); - COLORREF colOldText = ::SetTextColor(hdc, colText), - colOldBack = ::SetBkColor(hdc, colBack); - // *2, as in wxSYS_EDGE_Y - int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X); + HDC hdc = GetHdcOf(dc); + COLORREF colOldText = ::SetTextColor(hdc, colText), + colOldBack = ::SetBkColor(hdc, colBack); - // select the font and draw the text - // --------------------------------- + // *2, as in wxSYS_EDGE_Y + int margin = GetMarginWidth() + 2 * wxSystemSettings::GetMetric(wxSYS_EDGE_X); + // select the font and draw the text + // --------------------------------- - // determine where to draw and leave space for a check-mark. - // + 1 pixel to separate the edge from the highlight rectangle - int xText = rc.x + margin + 1; + // determine where to draw and leave space for a check-mark. + // + 1 pixel to separate the edge from the highlight rectangle + int xText = rc.x + margin + 1; - // using native API because it recognizes '&' - if ( IsOwnerDrawn() ) - { - int nPrevMode = SetBkMode(hdc, TRANSPARENT); - AutoHBRUSH hbr(colBack); - SelectInHDC selBrush(hdc, hbr); - RECT rectFill = { rc.GetLeft(), rc.GetTop(), - rc.GetRight() + 1, rc.GetBottom() + 1 }; + // using native API because it recognizes '&' + if ( IsOwnerDrawn() ) + { + int nPrevMode = SetBkMode(hdc, TRANSPARENT); + AutoHBRUSH hbr(colBack); + SelectInHDC selBrush(hdc, hbr); - if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge ) { - // only draw the highlight under the text, not under - // the bitmap or checkmark - rectFill.left = xText; - } + RECT rectFill = { rc.GetLeft(), rc.GetTop(), + rc.GetRight() + 1, rc.GetBottom() + 1 }; - FillRect(hdc, &rectFill, hbr); + if ( (st & wxODSelected) && m_bmpChecked.Ok() && draw_bitmap_edge ) + { + // only draw the highlight under the text, not under + // the bitmap or checkmark + rectFill.left = xText; + } - // use default font if no font set - wxFont fontToUse = GetFontToUse(); - SelectInHDC selFont(hdc, GetHfontOf(fontToUse)); + FillRect(hdc, &rectFill, hbr); - wxString strMenuText = m_strName.BeforeFirst('\t'); + // use default font if no font set + wxFont fontToUse = GetFontToUse(); + SelectInHDC selFont(hdc, GetHfontOf(fontToUse)); - xText += 3; // separate text from the highlight rectangle + wxString strMenuText = m_strName.BeforeFirst('\t'); - SIZE sizeRect; - ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect); - ::DrawState(hdc, NULL, NULL, - (LPARAM)strMenuText.c_str(), strMenuText.length(), - xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically - rc.GetWidth()-margin, sizeRect.cy, - DST_PREFIXTEXT | - (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) | - (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX + xText += 3; // separate text from the highlight rectangle - // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO - // as the last parameter in DrawState() (at least with Windows98). So we have - // to take care of right alignment ourselves. - if ( !m_strAccel.empty() ) - { - int accel_width, accel_height; - dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); - // right align accel string with right edge of menu ( offset by the - // margin width ) + SIZE sizeRect; + ::GetTextExtentPoint32(hdc, strMenuText.c_str(), strMenuText.Length(), &sizeRect); ::DrawState(hdc, NULL, NULL, - (LPARAM)m_strAccel.c_str(), m_strAccel.length(), - rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0), - 0, 0, - DST_TEXT | - (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); - } - - (void)SetBkMode(hdc, nPrevMode); - } - - - // draw the bitmap - // --------------- - if ( IsCheckable() && !m_bmpChecked.Ok() ) { - if ( st & wxODChecked ) { - // what goes on: DrawFrameControl creates a b/w mask, - // then we copy it to screen to have right colors - - // first create a monochrome bitmap in a memory DC - HDC hdcMem = CreateCompatibleDC(hdc); - HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0); - SelectObject(hdcMem, hbmpCheck); - - // then draw a check mark into it - RECT rect = { 0, 0, margin, m_nHeight }; - if ( m_nHeight > 0 ) - { - ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); - } - - // finally copy it to screen DC and clean up - BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, - hdcMem, 0, 0, SRCCOPY); + (LPARAM)strMenuText.c_str(), strMenuText.length(), + xText, rc.y + (int) ((rc.GetHeight()-sizeRect.cy)/2.0), // centre text vertically + rc.GetWidth()-margin, sizeRect.cy, + DST_PREFIXTEXT | + (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0) | + (((st & wxODHidePrefix) && !wxMSWSystemMenuFontModule::ms_showCues) ? 512 : 0)); // 512 == DSS_HIDEPREFIX + + // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO + // as the last parameter in DrawState() (at least with Windows98). So we have + // to take care of right alignment ourselves. + if ( !m_strAccel.empty() ) + { + int accel_width, accel_height; + dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); + // right align accel string with right edge of menu ( offset by the + // margin width ) + ::DrawState(hdc, NULL, NULL, + (LPARAM)m_strAccel.c_str(), m_strAccel.length(), + rc.GetWidth()-16-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0), + 0, 0, + DST_TEXT | + (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); + } - DeleteDC(hdcMem); - DeleteObject(hbmpCheck); + (void)SetBkMode(hdc, nPrevMode); } - } - else { - wxBitmap bmp; - if ( st & wxODDisabled ) - { - bmp = GetDisabledBitmap(); - } - if ( !bmp.Ok() ) + // draw the bitmap + // --------------- + if ( IsCheckable() && !m_bmpChecked.Ok() ) { - // for not checkable bitmaps we should always use unchecked one because - // their checked bitmap is not set - bmp = GetBitmap(!IsCheckable() || (st & wxODChecked)); + if ( st & wxODChecked ) + { + // what goes on: DrawFrameControl creates a b/w mask, + // then we copy it to screen to have right colors + + // first create a monochrome bitmap in a memory DC + HDC hdcMem = CreateCompatibleDC(hdc); + HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0); + SelectObject(hdcMem, hbmpCheck); + + // then draw a check mark into it + RECT rect = { 0, 0, margin, m_nHeight }; + if ( m_nHeight > 0 ) + { + ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); + } + + // finally copy it to screen DC and clean up + BitBlt(hdc, rc.x, rc.y, margin, m_nHeight, hdcMem, 0, 0, SRCCOPY); + + DeleteDC(hdcMem); + DeleteObject(hbmpCheck); + } } + else + { + wxBitmap bmp; - if ( bmp.Ok() ) { - wxMemoryDC dcMem(&dc); - dcMem.SelectObject(bmp); - - // center bitmap - int nBmpWidth = bmp.GetWidth(), - nBmpHeight = bmp.GetHeight(); - - // there should be enough space! - wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); - - int heightDiff = m_nHeight - nBmpHeight; - dc.Blit(rc.x + (margin - nBmpWidth) / 2, - rc.y + heightDiff / 2, - nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY, true /* use mask */); + if ( st & wxODDisabled ) + { + bmp = GetDisabledBitmap(); + } - if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) { - RECT rectBmp = { rc.GetLeft(), rc.GetTop(), - rc.GetLeft() + margin, - rc.GetTop() + m_nHeight }; - SetBkColor(hdc, colBack); + if ( !bmp.Ok() ) + { + // for not checkable bitmaps we should always use unchecked one because + // their checked bitmap is not set + bmp = GetBitmap(!IsCheckable() || (st & wxODChecked)); + } - DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT); - } + if ( bmp.Ok() ) + { + wxMemoryDC dcMem(&dc); + dcMem.SelectObject(bmp); + + // center bitmap + int nBmpWidth = bmp.GetWidth(), + nBmpHeight = bmp.GetHeight(); + + // there should be enough space! + wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); + + int heightDiff = m_nHeight - nBmpHeight; + dc.Blit(rc.x + (margin - nBmpWidth) / 2, + rc.y + heightDiff / 2, + nBmpWidth, nBmpHeight, + &dcMem, 0, 0, wxCOPY, true /* use mask */); + + if ( ( st & wxODSelected ) && !( st & wxODDisabled ) && draw_bitmap_edge ) + { + RECT rectBmp = { rc.GetLeft(), rc.GetTop(), + rc.GetLeft() + margin, + rc.GetTop() + m_nHeight }; + SetBkColor(hdc, colBack); + + DrawEdge(hdc, &rectBmp, BDR_RAISEDINNER, BF_RECT); + } + } } - } - ::SetTextColor(hdc, colOldText); - ::SetBkColor(hdc, colOldBack); + ::SetTextColor(hdc, colOldText); + ::SetBkColor(hdc, colOldBack); - return true; + return true; } diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index d072864e47..3aeab47d86 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -263,41 +263,41 @@ bool wxPen::RealizeResource() WXHANDLE wxPen::GetResourceHandle() const { - if ( !M_PENDATA ) - return 0; - else - return (WXHANDLE)M_PENDATA->m_hPen; + if ( !M_PENDATA ) + return 0; + else + return (WXHANDLE)M_PENDATA->m_hPen; } bool wxPen::FreeResource(bool WXUNUSED(force)) { - if (M_PENDATA && (M_PENDATA->m_hPen != 0)) - { - DeleteObject((HPEN) M_PENDATA->m_hPen); - M_PENDATA->m_hPen = 0; - return true; - } - else return false; + if (M_PENDATA && (M_PENDATA->m_hPen != 0)) + { + DeleteObject((HPEN) M_PENDATA->m_hPen); + M_PENDATA->m_hPen = 0; + return true; + } + else return false; } bool wxPen::IsFree() const { - return (M_PENDATA && M_PENDATA->m_hPen == 0); + return (M_PENDATA && M_PENDATA->m_hPen == 0); } void wxPen::Unshare() { - // Don't change shared data - if (!m_refData) + // Don't change shared data + if (!m_refData) { - m_refData = new wxPenRefData(); - } + m_refData = new wxPenRefData(); + } else { - wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); - UnRef(); - m_refData = ref; - } + wxPenRefData* ref = new wxPenRefData(*(wxPenRefData*)m_refData); + UnRef(); + m_refData = ref; + } } void wxPen::SetColour(const wxColour& col) diff --git a/src/msw/registry.cpp b/src/msw/registry.cpp index 33eb4fae36..a8e077e8c8 100644 --- a/src/msw/registry.cpp +++ b/src/msw/registry.cpp @@ -710,20 +710,21 @@ bool wxRegKey::DeleteKey(const wxChar *szKey) bool wxRegKey::DeleteValue(const wxChar *szValue) { - if ( !Open() ) - return false; + if ( !Open() ) + return false; m_dwLastError = RegDeleteValue((HKEY) m_hKey, WXSTRINGCAST szValue); // deleting a value which doesn't exist is not considered an error if ( (m_dwLastError != ERROR_SUCCESS) && - (m_dwLastError != ERROR_FILE_NOT_FOUND) ) { - wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"), - szValue, GetName().c_str()); - return false; + (m_dwLastError != ERROR_FILE_NOT_FOUND) ) + { + wxLogSysError(m_dwLastError, _("Can't delete value '%s' from key '%s'"), + szValue, GetName().c_str()); + return false; } - return true; + return true; } // ---------------------------------------------------------------------------- @@ -733,8 +734,8 @@ bool wxRegKey::DeleteValue(const wxChar *szValue) // return true if value exists bool wxRegKey::HasValue(const wxChar *szValue) const { - // this function should be silent, so suppress possible messages from Open() - wxLogNull nolog; + // this function should be silent, so suppress possible messages from Open() + wxLogNull nolog; if ( !CONST_CAST Open(Read) ) return false; diff --git a/src/msw/settings.cpp b/src/msw/settings.cpp index 69aebf7fc1..76d77a96bf 100644 --- a/src/msw/settings.cpp +++ b/src/msw/settings.cpp @@ -172,7 +172,7 @@ wxColour wxSystemSettingsNative::GetColour(wxSystemColour index) index = wxSYS_COLOUR_MENU ; } } - } + } if ( useDefault ) { diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp index 35abc8ef78..9f430540c2 100644 --- a/src/msw/sound.cpp +++ b/src/msw/sound.cpp @@ -126,32 +126,32 @@ bool wxSound::DoPlay(unsigned flags) const bool wxSound::Free() { - if (m_waveData) - { + if (m_waveData) + { #ifdef __WXWINCE__ - HGLOBAL waveData = (HGLOBAL) m_waveData; + HGLOBAL waveData = (HGLOBAL) m_waveData; #else - HGLOBAL waveData = GlobalHandle(m_waveData); + HGLOBAL waveData = GlobalHandle(m_waveData); #endif - if (waveData) - { + if (waveData) + { #ifndef __WXWINCE__ - if (m_isResource) - ::FreeResource(waveData); - else + if (m_isResource) + ::FreeResource(waveData); + else #endif - { - GlobalUnlock(waveData); - GlobalFree(waveData); - } - - m_waveData = NULL; - m_waveLength = 0; - return true; + { + GlobalUnlock(waveData); + GlobalFree(waveData); + } + + m_waveData = NULL; + m_waveLength = 0; + return true; + } } - } - return false; + return false; } /*static*/ void wxSound::Stop()