From: Vadim Zeitlin Date: Tue, 8 Jul 2003 23:02:14 +0000 (+0000) Subject: deprecated and removed from our code GetUseCtl3D()/TransparentBackground() X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/35821d8fe021a3aa3c59b50ad2c897616bf25da5 deprecated and removed from our code GetUseCtl3D()/TransparentBackground() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/changes.txt b/docs/changes.txt index f094d7013b..d9a560b63b 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -29,6 +29,8 @@ versions, please update your code to not use them. - wxHashTableLong: use wxHashMap instead - wxArrayString::GetStringArray: no replacement - wxArrayString::Remove(index, count): use RemoveAt instead +- [MSW only] wxWindow::GetUseCtl3D(), GetTransparentBackground() and + SetTransparent() as well as wxNO_3D and wxUSER_COLOURS styles OTHER CHANGES diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp index f92b66426a..740d574451 100644 --- a/src/msw/choice.cpp +++ b/src/msw/choice.cpp @@ -413,11 +413,6 @@ WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED( ) { HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); if (!IsEnabled()) diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp index 5082a9b728..cb069d9cfd 100644 --- a/src/msw/combobox.cpp +++ b/src/msw/combobox.cpp @@ -162,11 +162,6 @@ WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE ) { HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); if (!IsEnabled()) diff --git a/src/msw/control.cpp b/src/msw/control.cpp index fc29f742cc..94cc8a9dc2 100644 --- a/src/msw/control.cpp +++ b/src/msw/control.cpp @@ -276,11 +276,6 @@ WXHBRUSH wxControl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED #endif // wxUSE_CTL3D HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground() /* || (GetParent()->GetExtraStyle() & wxWS_EX_THEMED_BACKGROUND) */ ) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); ::SetBkColor(hdc, wxColourToRGB(colBack)); diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp index 36d514174e..f565a60b86 100644 --- a/src/msw/radiobox.cpp +++ b/src/msw/radiobox.cpp @@ -821,11 +821,6 @@ WXHBRUSH wxRadioBox::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE #endif // wxUSE_CTL3D HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); if (!IsEnabled()) diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp index 1c63618df5..8b901fa107 100644 --- a/src/msw/textctrl.cpp +++ b/src/msw/textctrl.cpp @@ -1483,11 +1483,6 @@ WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSE #endif // wxUSE_CTL3D HDC hdc = (HDC)pDC; - if (GetParent()->GetTransparentBackground()) - SetBkMode(hdc, TRANSPARENT); - else - SetBkMode(hdc, OPAQUE); - wxColour colBack = GetBackgroundColour(); if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index e552ef0e44..5341aa8fd5 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -330,7 +330,6 @@ void wxWindowMSW::Init() // MSW specific m_isBeingDeleted = FALSE; m_oldWndProc = NULL; - m_useCtl3D = FALSE; m_mouseInWindow = FALSE; m_lastKeydownProcessed = FALSE; @@ -343,7 +342,6 @@ void wxWindowMSW::Init() m_xThumbSize = 0; m_yThumbSize = 0; - m_backgroundTransparent = FALSE; // as all windows are created with WS_VISIBLE style... m_isShown = TRUE;