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 f094d7013bfafcffdde56e0095fe56f9fb057ce6..d9a560b63b3712eb7725469582591719ebe3c976 100644 (file)
--- 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
 - 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
 
 
 OTHER CHANGES

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index f92b66426afa871ffdec54148afc35ec02fcd2db..740d574451f94061b8b0a188b3b7c18c11aed34c 100644 (file)
--- 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;
      )
 {
     HDC hdc = (HDC)pDC;

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode(hdc, TRANSPARENT);
-    else
-        SetBkMode(hdc, OPAQUE);
-

     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())

diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp
index 5082a9b72847d65aeed1e0dd7b30baa1d4542957..cb069d9cfdbb398a05337deb936ab89abf03ea52 100644 (file)
--- 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;
     )
 {
     HDC hdc = (HDC)pDC;

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode(hdc, TRANSPARENT);
-    else
-        SetBkMode(hdc, OPAQUE);
-

     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())

diff --git a/src/msw/control.cpp b/src/msw/control.cpp
index fc29f742cc0572b3c7002f985353d58db97c046c..94cc8a9dc25155446a5cfd65f67f62174d2b59b4 100644 (file)
--- 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;
 #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));
     wxColour colBack = GetBackgroundColour();
 
     ::SetBkColor(hdc, wxColourToRGB(colBack));

diff --git a/src/msw/radiobox.cpp b/src/msw/radiobox.cpp
index 36d514174e04c56d58b6f0efc586a3e4b0f322bd..f565a60b86d254ef5ffba8423f72756cd177e882 100644 (file)
--- 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;
 #endif // wxUSE_CTL3D
 
     HDC hdc = (HDC)pDC;

-    if (GetParent()->GetTransparentBackground())
-        SetBkMode(hdc, TRANSPARENT);
-    else
-        SetBkMode(hdc, OPAQUE);
-

     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled())

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 1c63618df51a471e869f53b396ccb4fc05af079a..8b901fa1071e588f4e66706fa4770f1131300de5 100644 (file)
--- 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;
 #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)
     wxColour colBack = GetBackgroundColour();
 
     if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index e552ef0e44c3a54c03aaeaef02aa68c32198062d..5341aa8fd5932dc9606867636bfda8fb99bf755b 100644 (file)
--- 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;
     // MSW specific
     m_isBeingDeleted = FALSE;
     m_oldWndProc = NULL;

-    m_useCtl3D = FALSE;

     m_mouseInWindow = FALSE;
     m_lastKeydownProcessed = FALSE;
 
     m_mouseInWindow = FALSE;
     m_lastKeydownProcessed = FALSE;
 


@@ -343,7 +342,6 @@ void wxWindowMSW::Init()
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;
 
     m_xThumbSize = 0;
     m_yThumbSize = 0;

-    m_backgroundTransparent = FALSE;

 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;
 
     // as all windows are created with WS_VISIBLE style...
     m_isShown = TRUE;