Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced OnCtlColor(7 params) with MSWControlColor(1 param)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-19 19:40:31 +00:00
parent f464a4f2af
commit 48fa6bd38a
18 changed files with 20 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/msw/choice.h
View File

@@ -84,8 +84,7 @@ public:
// MSW only // MSW only
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, virtual WXHBRUSH MSWControlColor(WXHDC hDC);
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
protected: protected:
virtual void DoMoveWindow(int x, int y, int width, int height); virtual void DoMoveWindow(int x, int y, int width, int height);

3
include/wx/msw/combobox.h
View File

@@ -104,9 +104,6 @@ public:
bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam); bool MSWProcessEditMsg(WXUINT msg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam); virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
WXHWND GetEditHWND() const; WXHWND GetEditHWND() const;
protected: protected:

5
include/wx/msw/dialog.h
View File

@@ -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
// ---------------- // ----------------

2
include/wx/msw/scrolbar.h
View File

@@ -54,8 +54,6 @@ public:
void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; } void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control);

2
include/wx/msw/slider95.h
View File

@@ -78,8 +78,6 @@ public:
virtual bool ContainsHWND(WXHWND hWnd) const; virtual bool ContainsHWND(WXHWND hWnd) const;
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control);

2
include/wx/msw/slidrmsw.h
View File

@@ -73,8 +73,6 @@ public:
virtual bool ContainsHWND(WXHWND hWnd) const; virtual bool ContainsHWND(WXHWND hWnd) const;
void Command(wxCommandEvent& event); void Command(wxCommandEvent& event);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual bool MSWOnScroll(int orientation, WXWORD wParam, virtual bool MSWOnScroll(int orientation, WXWORD wParam,
WXWORD pos, WXHWND control); WXWORD pos, WXHWND control);

3
include/wx/msw/textctrl.h
View File

@@ -148,8 +148,7 @@ public:
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, virtual WXHBRUSH MSWControlColor(WXHDC hDC);
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
#if wxUSE_RICHEDIT #if wxUSE_RICHEDIT
virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result); virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);

2
include/wx/msw/wince/textctrlce.h
View File

@@ -139,8 +139,6 @@ public:
virtual void Command(wxCommandEvent& event); virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id); virtual bool MSWCommand(WXUINT param, WXWORD id);
virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
virtual void AdoptAttributesFromHWND(); virtual void AdoptAttributesFromHWND();

15
include/wx/msw/window.h
View File

@@ -305,12 +305,7 @@ public:
bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
bool HandleCtlColor(WXHBRUSH *hBrush, bool HandleCtlColor(WXHBRUSH *hBrush, WXHDC hdc, WXHWND hWnd);
WXHDC hdc,
WXHWND hWnd,
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam);
bool HandlePaletteChanged(WXHWND hWndPalChange); bool HandlePaletteChanged(WXHWND hWndPalChange);
bool HandleQueryNewPalette(); bool HandleQueryNewPalette();
@@ -369,14 +364,6 @@ public:
// with or 0 for the default brush // with or 0 for the default brush
virtual WXHBRUSH MSWControlColor(WXHDC hDC); virtual WXHBRUSH MSWControlColor(WXHDC hDC);
// deprecated, for compatibility only: override MSWControlColor instead
virtual WXHBRUSH OnCtlColor(WXHDC hDC,
WXHWND hWnd,
WXUINT nCtlColor,
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam);
// Responds to colour changes: passes event on to children. // Responds to colour changes: passes event on to children.
void OnSysColourChanged(wxSysColourChangedEvent& event); void OnSysColourChanged(wxSysColourChangedEvent& event);

27
src/msw/choice.cpp
View File

@@ -582,8 +582,10 @@ WXLRESULT wxChoice::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
WXHWND hwnd; WXHWND hwnd;
UnpackCtlColor(wParam, lParam, &hdc, &hwnd); UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
return (WXLRESULT)OnCtlColor(hdc, hwnd, 0, WXHBRUSH hbr = MSWControlColor((WXHDC)hdc);
nMsg, wParam, lParam); if ( hbr )
return (WXLRESULT)hbr;
//else: fall through to default window proc
} }
} }
@@ -615,24 +617,13 @@ bool wxChoice::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
return true; return true;
} }
WXHBRUSH wxChoice::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), WXHBRUSH wxChoice::MSWControlColor(WXHDC hDC)
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam)
)
{ {
HDC hdc = (HDC)pDC; if ( !IsEnabled() )
wxColour colBack = GetBackgroundColour(); return MSWControlColorDisabled(hDC);
if (!IsEnabled()) return wxChoiceBase::MSWControlColorSolid(hDC);
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
} }
#endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__) #endif // wxUSE_CHOICE && !(__SMARTPHONE__ && __WXWINCE__)

32
src/msw/combobox.cpp
View File

@@ -213,27 +213,6 @@ LRESULT APIENTRY _EXPORT wxComboEditWndProc(HWND hWnd,
return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam); return ::CallWindowProc(CASTWNDPROC gs_wndprocEdit, hWnd, message, wParam, lParam);
} }
WXHBRUSH wxComboBox::OnCtlColor(WXHDC pDC,
WXHWND WXUNUSED(pWnd),
WXUINT WXUNUSED(nCtlColor),
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam))
{
HDC hdc = (HDC)pDC;
wxColour colBack = GetBackgroundColour();
if (!IsEnabled())
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
}
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxComboBox callbacks // wxComboBox callbacks
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -244,16 +223,6 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
// colour correctly (to be the same as our own one) // colour correctly (to be the same as our own one)
switch ( nMsg ) switch ( nMsg )
{ {
// we have to handle both: one for the normal case and the other for
// wxCB_READONLY
case WM_CTLCOLOREDIT:
case WM_CTLCOLORSTATIC:
WXHDC hdc;
WXHWND hwnd;
UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
return (WXLRESULT)OnCtlColor(hdc, hwnd, 0, nMsg, wParam, lParam);
case CB_SETCURSEL: case CB_SETCURSEL:
// Selection was set with SetSelection. Update the value too. // Selection was set with SetSelection. Update the value too.
if ((int)wParam > GetCount()) if ((int)wParam > GetCount())
@@ -261,7 +230,6 @@ WXLRESULT wxComboBox::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
else else
m_value = GetString(wParam); m_value = GetString(wParam);
break; break;
} }
return wxChoice::MSWWindowProc(nMsg, wParam, lParam); return wxChoice::MSWWindowProc(nMsg, wParam, lParam);

15
src/msw/dialog.cpp
View File

@@ -530,18 +530,3 @@ WXLRESULT wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lPar
return rc; return rc;
} }
#if wxUSE_CTL3D
// Define for each class of dialog and control
WXHBRUSH wxDialog::OnCtlColor(WXHDC WXUNUSED(pDC),
WXHWND WXUNUSED(pWnd),
WXUINT WXUNUSED(nCtlColor),
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam)
{
return (WXHBRUSH)Ctl3dCtlColorEx(message, wParam, lParam);
}
#endif // wxUSE_CTL3D

7
src/msw/scrolbar.cpp
View File

@@ -363,13 +363,6 @@ void wxScrollBar::SetScrollbar(int position, int thumbSize, int range, int pageS
#endif #endif
} }
WXHBRUSH wxScrollBar::OnCtlColor(WXHDC WXUNUSED(pDC), WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
WXUINT WXUNUSED(message), WXWPARAM WXUNUSED(wParam), WXLPARAM WXUNUSED(lParam))
{
return 0;
}
void wxScrollBar::Command(wxCommandEvent& event) void wxScrollBar::Command(wxCommandEvent& event)
{ {
SetThumbPosition(event.m_commandInt); SetThumbPosition(event.m_commandInt);

14
src/msw/slider95.cpp
View File

@@ -722,20 +722,6 @@ void wxSlider95::SetRange(int minValue, int maxValue)
} }
} }
WXHBRUSH wxSlider95::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
#ifndef __WXWINCE__
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
return 0;
#else
if ( nCtlColor != CTLCOLOR_STATIC )
return 0;
#endif
// Otherwise, it's a static
return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
// For trackbars only // For trackbars only
void wxSlider95::SetTickFreq(int n, int pos) void wxSlider95::SetTickFreq(int n, int pos)
{ {

10
src/msw/slidrmsw.cpp
View File

@@ -481,16 +481,6 @@ void wxSliderMSW::SetRange(int minValue, int maxValue)
} }
} }
WXHBRUSH wxSliderMSW::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
{
if ( nCtlColor == CTLCOLOR_SCROLLBAR )
return 0;
// Otherwise, it's a static
return wxControl::OnCtlColor(pDC, pWnd, nCtlColor, message, wParam, lParam);
}
void wxSliderMSW::SetPageSize(int pageSize) void wxSliderMSW::SetPageSize(int pageSize)
{ {
m_pageSize = pageSize; m_pageSize = pageSize;

34
src/msw/textctrl.cpp
View File

@@ -1856,38 +1856,12 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
return true; return true;
} }
WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor), WXHBRUSH wxTextCtrl::MSWControlColor(WXHDC hDC)
#if wxUSE_CTL3D
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam
#else
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam)
#endif
)
{ {
#if wxUSE_CTL3D if ( !IsEnabled() && !HasFlag(wxTE_MULTILINE) )
if ( m_useCtl3D ) return MSWControlColorDisabled(hDC);
{
HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
return (WXHBRUSH) hbrush;
}
#endif // wxUSE_CTL3D
HDC hdc = (HDC)pDC; return wxTextCtrlBase::MSWControlColorSolid(hDC);
wxColour colBack = GetBackgroundColour();
if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
} }
bool wxTextCtrl::AdjustSpaceLimit() bool wxTextCtrl::AdjustSpaceLimit()

34
src/msw/wince/textctrlce.cpp
View File

@@ -1040,40 +1040,6 @@ bool wxTextCtrl::MSWCommand(WXUINT param, WXWORD WXUNUSED(id))
return true; return true;
} }
WXHBRUSH wxTextCtrl::OnCtlColor(WXHDC pDC, WXHWND WXUNUSED(pWnd), WXUINT WXUNUSED(nCtlColor),
#if wxUSE_CTL3D
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam
#else
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam)
#endif
)
{
#if wxUSE_CTL3D
if ( m_useCtl3D )
{
HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
return (WXHBRUSH) hbrush;
}
#endif // wxUSE_CTL3D
HDC hdc = (HDC)pDC;
wxColour colBack = GetBackgroundColour();
if (!IsEnabled() && (GetWindowStyle() & wxTE_MULTILINE) == 0)
colBack = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
::SetBkColor(hdc, wxColourToRGB(colBack));
::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
wxBrush *brush = wxTheBrushList->FindOrCreateBrush(colBack, wxSOLID);
return (WXHBRUSH)brush->GetResourceHandle();
}
bool wxTextCtrl::AdjustSpaceLimit() bool wxTextCtrl::AdjustSpaceLimit()
{ {
unsigned int limit = ::SendMessage(GetBuddyHwnd(), EM_GETLIMITTEXT, 0, 0); unsigned int limit = ::SendMessage(GetBuddyHwnd(), EM_GETLIMITTEXT, 0, 0);

29
src/msw/window.cpp
View File

@@ -2706,12 +2706,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
WXHWND hwnd; WXHWND hwnd;
UnpackCtlColor(wParam, lParam, &hdc, &hwnd); UnpackCtlColor(wParam, lParam, &hdc, &hwnd);
processed = HandleCtlColor(&rc.hBrush, processed = HandleCtlColor(&rc.hBrush, (WXHDC)hdc, (WXHWND)hwnd);
(WXHDC)hdc,
(WXHWND)hwnd,
message,
wParam,
lParam);
} }
break; break;
#endif // !__WXMICROWIN__ #endif // !__WXMICROWIN__
@@ -3740,17 +3735,12 @@ bool wxWindowMSW::HandleDisplayChange()
#ifndef __WXMICROWIN__ #ifndef __WXMICROWIN__
bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush, bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush, WXHDC pDC, WXHWND pWnd)
WXHDC pDC,
WXHWND pWnd,
WXUINT message,
WXWPARAM wParam,
WXLPARAM lParam)
{ {
#if wxUSE_CONTROLS #if wxUSE_CONTROLS
wxControl *item = (wxControl *)FindItemByHWND(pWnd, true); wxWindow *item = FindItemByHWND(pWnd, true);
if ( item ) if ( item )
*brush = item->OnCtlColor(pDC, pWnd, 0, message, wParam, lParam); *brush = item->MSWControlColor(pDC);
else else
#endif // wxUSE_CONTROLS #endif // wxUSE_CONTROLS
*brush = NULL; *brush = NULL;
@@ -3760,17 +3750,6 @@ bool wxWindowMSW::HandleCtlColor(WXHBRUSH *brush,
#endif // __WXMICROWIN__ #endif // __WXMICROWIN__
// Define for each class of dialog and control
WXHBRUSH wxWindowMSW::OnCtlColor(WXHDC hDC,
WXHWND WXUNUSED(hWnd),
WXUINT WXUNUSED(nCtlColor),
WXUINT WXUNUSED(message),
WXWPARAM WXUNUSED(wParam),
WXLPARAM WXUNUSED(lParam))
{
return MSWControlColor(hDC);
}
WXHBRUSH wxWindowMSW::MSWControlColor(WXHDC WXUNUSED(hDC)) WXHBRUSH wxWindowMSW::MSWControlColor(WXHDC WXUNUSED(hDC))
{ {
return (WXHBRUSH)0; return (WXHBRUSH)0;