removed obsolete wxUSE_CTL3D
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -117,10 +117,6 @@ WXDLLEXPORT_DATA(extern HFONT) wxSTATUS_LINE_FONT;
|
|||||||
VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
|
VOID WINAPI ibAdjustWindowRect( HWND hWnd, LPRECT lprc ) ;
|
||||||
#endif // wxUSE_ITSY_BITSY
|
#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
|
* Decide what window classes we're going to use
|
||||||
* for this combination of CTl3D/FAFA settings
|
* for this combination of CTl3D/FAFA settings
|
||||||
|
@@ -1044,18 +1044,6 @@
|
|||||||
// Recommended setting: 1
|
// Recommended setting: 1
|
||||||
#define wxUSE_OLE 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
|
// 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
|
// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
|
||||||
// miniframes support instead.
|
// miniframes support instead.
|
||||||
@@ -1116,5 +1104,5 @@
|
|||||||
// NOW MANDATORY: don't change.
|
// NOW MANDATORY: don't change.
|
||||||
#define wxUSE_DYNAMIC_CLASSES 1
|
#define wxUSE_DYNAMIC_CLASSES 1
|
||||||
|
|
||||||
#endif
|
#endif // _WX_SETUP_H_
|
||||||
// _WX_SETUP_H_
|
|
||||||
|
@@ -1034,18 +1034,6 @@
|
|||||||
// Recommended setting: 1
|
// Recommended setting: 1
|
||||||
#define wxUSE_OLE 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
|
// 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
|
// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
|
||||||
// miniframes support instead.
|
// miniframes support instead.
|
||||||
|
@@ -82,11 +82,6 @@ public:
|
|||||||
// Windows callbacks
|
// Windows callbacks
|
||||||
WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
|
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
|
||||||
// ----------------
|
// ----------------
|
||||||
|
|
||||||
|
@@ -1025,18 +1025,6 @@
|
|||||||
// Recommended setting: 1
|
// Recommended setting: 1
|
||||||
#define wxUSE_OLE 0
|
#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
|
// 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
|
// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
|
||||||
// miniframes support instead.
|
// miniframes support instead.
|
||||||
|
@@ -1114,14 +1114,6 @@
|
|||||||
// Recommended setting: 1 for WIN32
|
// Recommended setting: 1 for WIN32
|
||||||
#define wxUSE_OLE 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: 0
|
|
||||||
#define wxUSE_CTL3D 0
|
|
||||||
|
|
||||||
// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for
|
// 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
|
// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native
|
||||||
// miniframes support instead.
|
// miniframes support instead.
|
||||||
|
@@ -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));
|
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE));
|
||||||
Refresh();
|
Refresh();
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user