removed obsolete wxUSE_CTL3D

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h
index cdb8b5e95384548ff6f8006472dbfbf6ac47bf83..503f119bed65bb11038eb6f4b1faf295a93a2955 100644 (file)
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -117,10 +117,6 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
     VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
 #endif // wxUSE_ITSY_BITSY
 
     VOID    WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
 #endif // wxUSE_ITSY_BITSY
 

-#if wxUSE_CTL3D
-    #include "wx/msw/ctl3d/ctl3d.h"
-#endif // wxUSE_CTL3D
-

 /*
  * Decide what window classes we're going to use
  * for this combination of CTl3D/FAFA settings
 /*
  * Decide what window classes we're going to use
  * for this combination of CTl3D/FAFA settings

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 70471a13493342dbfba761b8a230218497a22016..d3748afbcf01b44c9313a33508dc885ea1e69561 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1044,18 +1044,6 @@
 // Recommended setting: 1
 #define wxUSE_OLE           1
 
 // Recommended setting: 1
 #define wxUSE_OLE           1
 

-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_CTL3D                      0
-#else
-#define wxUSE_CTL3D                      1
-#endif
-

 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.
 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.


@@ -1116,5 +1104,5 @@
 // NOW MANDATORY: don't change.
 #define wxUSE_DYNAMIC_CLASSES     1
 
 // NOW MANDATORY: don't change.
 #define wxUSE_DYNAMIC_CLASSES     1
 

-#endif
-    // _WX_SETUP_H_
+#endif // _WX_SETUP_H_
+

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index c691ae3137d82c1d875be2b85b704ef22e422848..b8c2d34f8bcf612aef9ebadcab9cbbf47db5b75a 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -1034,18 +1034,6 @@
 // Recommended setting: 1
 #define wxUSE_OLE           1
 
 // Recommended setting: 1
 #define wxUSE_OLE           1
 

-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_CTL3D                      0
-#else
-#define wxUSE_CTL3D                      1
-#endif
-

 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.
 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.

diff --git a/include/wx/palmos/dialog.h b/include/wx/palmos/dialog.h
index 631096f61b00fc46f8d927252435c07b96e6774d..3f691683bba04ea1f3fdcc33a5d031010b8db879 100644 (file)
--- a/include/wx/palmos/dialog.h
+++ b/include/wx/palmos/dialog.h
@@ -82,11 +82,6 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 

-#if wxUSE_CTL3D
-    virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
-                                WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-#endif // wxUSE_CTL3D
-

     // obsolete methods
     // ----------------
 
     // obsolete methods
     // ----------------
 

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 306b1cd17d89b0ef4ec8e1a89196c1f7ab4bac8e..554f1b1a30e17cceb81a59bbc04fede98452d1c2 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -1025,18 +1025,6 @@
 // Recommended setting: 1
 #define wxUSE_OLE           0
 
 // Recommended setting: 1
 #define wxUSE_OLE           0
 

-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: same as default
-#if defined(__WIN95__)
-#define wxUSE_CTL3D                      0
-#else
-#define wxUSE_CTL3D                      0
-#endif
-

 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.
 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index a8eb0fec27d06196660a5f86a292e92f7688676e..d108f055c69c953c1042202120293b2071418ba0 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -1114,14 +1114,6 @@
 // Recommended setting: 1 for WIN32
     #define wxUSE_OLE 1
 
 // Recommended setting: 1 for WIN32
     #define wxUSE_OLE 1
 

-// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT
-// 3.x. This setting is ignored under Win9x and NT 4.0+.
-//
-// Default is 0 for (most) Win32 (systems), 1 for Win16
-//
-// Recommended setting: 0
-#define wxUSE_CTL3D 0
-

 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.
 // Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
 // wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
 // miniframes support instead.

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index d4967646023e40e4f017e6378602733ea8dba2d2..8ecdaa9680ac37f2d08c2ed41b2e4ef1b70acba2 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -429,12 +429,8 @@ void wxDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {
 
 void wxDialog::OnSysColourChanged(wxSysColourChangedEvent& WXUNUSED(event))
 {

-#if wxUSE_CTL3D
-    Ctl3dColorChange();
-#else

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
     Refresh();

-#endif

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------