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

Reverted renderer changes and just use window variant within renderer functions

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-02-09 14:05:11 +00:00
parent e0666bdc7b
commit a61c912241
4 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/renderer.tex
View File

@@ -74,10 +74,6 @@ enum
wxCONTROL_SELECTED = 0x00000020, // selected item in e.g. listbox wxCONTROL_SELECTED = 0x00000020, // selected item in e.g. listbox
wxCONTROL_CHECKED = 0x00000040, // (check/radio button) is checked wxCONTROL_CHECKED = 0x00000040, // (check/radio button) is checked
wxCONTROL_CHECKABLE = 0x00000080, // (menu) item can be checked wxCONTROL_CHECKABLE = 0x00000080, // (menu) item can be checked
wxCONTROL_SIZE_NORMAL = 0x00000100,
wxCONTROL_SIZE_LARGE = 0x00000200,
wxCONTROL_SIZE_SMALL = 0x00000400,
wxCONTROL_SIZE_MINI = 0x00000800,
wxCONTROL_UNDETERMINED = wxCONTROL_CHECKABLE // (check) undetermined state wxCONTROL_UNDETERMINED = wxCONTROL_CHECKABLE // (check) undetermined state
}; };
\end{verbatim} \end{verbatim}

7
include/wx/renderer.h
View File

@@ -62,12 +62,7 @@ enum
wxCONTROL_CHECKABLE = 0x00000080, // (menu) item can be checked wxCONTROL_CHECKABLE = 0x00000080, // (menu) item can be checked
wxCONTROL_UNDETERMINED = wxCONTROL_CHECKABLE, // (check) undetermined state wxCONTROL_UNDETERMINED = wxCONTROL_CHECKABLE, // (check) undetermined state
wxCONTROL_SIZE_NORMAL = 0x00000100, wxCONTROL_FLAGS_MASK = 0x000000ff,
wxCONTROL_SIZE_LARGE = 0x00000200,
wxCONTROL_SIZE_SMALL = 0x00000400,
wxCONTROL_SIZE_MINI = 0x00000800,
wxCONTROL_FLAGS_MASK = 0x00000fff,
// this is a pseudo flag not used directly by wxRenderer but rather by some // this is a pseudo flag not used directly by wxRenderer but rather by some
// controls internally // controls internally

12
src/common/combocmn.cpp
View File

@@ -1347,11 +1347,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
} }
// Draw standard button // Draw standard button
if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
drawState |= wxCONTROL_SIZE_SMALL;
else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
drawState |= wxCONTROL_SIZE_MINI;
wxRendererNative::Get().DrawComboBoxDropButton(this, wxRendererNative::Get().DrawComboBoxDropButton(this,
dc, dc,
drawRect, drawRect,
@@ -1385,11 +1380,6 @@ void wxComboCtrlBase::DrawButton( wxDC& dc, const wxRect& rect, int paintBg )
dc.DrawRectangle(rect); dc.DrawRectangle(rect);
} }
if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL)
drawState |= wxCONTROL_SIZE_SMALL;
else if (GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI)
drawState |= wxCONTROL_SIZE_MINI;
wxRendererNative::Get().DrawPushButton(this, wxRendererNative::Get().DrawPushButton(this,
dc, dc,
drawRect, drawRect,
@@ -1865,7 +1855,7 @@ void wxComboCtrlBase::ShowPopup()
} }
winPopup->Enable(); winPopup->Enable();
wxASSERT( !m_popup || m_popup == popup ); // Consistency check. wxASSERT( !m_popup || m_popup == popup ); // Consistency check.
wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup, wxSize adjustedSize = m_popupInterface->GetAdjustedSize(widthPopup,

37
src/mac/carbon/renderer.cpp
View File

@@ -42,7 +42,7 @@ public:
wxHeaderButtonParams* params = NULL ); wxHeaderButtonParams* params = NULL );
virtual int GetHeaderButtonHeight(wxWindow *win); virtual int GetHeaderButtonHeight(wxWindow *win);
// draw the expanded/collapsed icon for a tree control item // draw the expanded/collapsed icon for a tree control item
virtual void DrawTreeItemButton( wxWindow *win, virtual void DrawTreeItemButton( wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -61,12 +61,12 @@ public:
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawPushButton(wxWindow *win, virtual void DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
int flags = 0); int flags = 0);
virtual void DrawItemSelectionRect(wxWindow *win, virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc, wxDC& dc,
const wxRect& rect, const wxRect& rect,
@@ -79,7 +79,7 @@ private:
int flags, int flags,
int kind, int kind,
int adornment); int adornment);
// the tree buttons // the tree buttons
wxBitmap m_bmpTreeExpanded; wxBitmap m_bmpTreeExpanded;
wxBitmap m_bmpTreeCollapsed; wxBitmap m_bmpTreeCollapsed;
@@ -168,7 +168,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
// The down arrow is drawn automatically, change it to an up arrow if needed. // The down arrow is drawn automatically, change it to an up arrow if needed.
if ( sortArrow == wxHDR_SORT_ICON_UP ) if ( sortArrow == wxHDR_SORT_ICON_UP )
drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp; drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
// If we don't want any arrows we need to draw over the one already there // If we don't want any arrows we need to draw over the one already there
@@ -181,7 +181,7 @@ int wxRendererMac::DrawHeaderButton( wxWindow *win,
headerRect.size.width += 25; headerRect.size.width += 25;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
CGContextRestoreGState( cgContext ); CGContextRestoreGState( cgContext );
} }
} }
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
@@ -233,7 +233,7 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
const wxCoord y = rect.y; const wxCoord y = rect.y;
const wxCoord w = rect.width; const wxCoord w = rect.width;
const wxCoord h = rect.height; const wxCoord h = rect.height;
#endif #endif
dc.SetBrush( *wxTRANSPARENT_BRUSH ); dc.SetBrush( *wxTRANSPARENT_BRUSH );
@@ -283,10 +283,10 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
// Apple mailing list posts say to use the arrow adornment constants, but those don't work. // Apple mailing list posts say to use the arrow adornment constants, but those don't work.
// We need to set the value using the 'old' DrawThemeButton constants instead. // We need to set the value using the 'old' DrawThemeButton constants instead.
drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight; drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight;
drawInfo.adornment = kThemeAdornmentNone; drawInfo.adornment = kThemeAdornmentNone;
HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect ); HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
} }
#if wxMAC_USE_CORE_GRAPHICS #if wxMAC_USE_CORE_GRAPHICS
@@ -370,7 +370,7 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
const wxRect& rect, const wxRect& rect,
int flags ) int flags )
{ {
RGBColor selColor; RGBColor selColor;
if (flags & wxCONTROL_SELECTED) if (flags & wxCONTROL_SELECTED)
{ {
if (flags & wxCONTROL_FOCUSED) if (flags & wxCONTROL_FOCUSED)
@@ -378,7 +378,7 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
else else
GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor); GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor);
} }
wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID ); wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID );
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
@@ -474,17 +474,17 @@ wxRendererMac::DrawComboBoxDropButton(wxWindow *win,
int flags) int flags)
{ {
int kind; int kind;
if (flags & wxCONTROL_SIZE_SMALL) if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemeArrowButtonSmall; kind = kThemeArrowButtonSmall;
else if (flags & wxCONTROL_SIZE_MINI) else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
kind = kThemeArrowButtonMini; kind = kThemeArrowButtonMini;
else else
kind = kThemeArrowButton; kind = kThemeArrowButton;
DrawMacThemeButton(win, dc, rect, flags, DrawMacThemeButton(win, dc, rect, flags,
kind, kThemeAdornmentArrowDownArrow); kind, kThemeAdornmentArrowDownArrow);
} }
void void
wxRendererMac::DrawPushButton(wxWindow *win, wxRendererMac::DrawPushButton(wxWindow *win,
wxDC& dc, wxDC& dc,
@@ -492,7 +492,10 @@ wxRendererMac::DrawPushButton(wxWindow *win,
int flags) int flags)
{ {
int kind; int kind;
if (flags & wxCONTROL_SIZE_SMALL) if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
kind = kThemeBevelButtonSmall;
// There is no kThemeBevelButtonMini, but in this case, use Small
else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
kind = kThemeBevelButtonSmall; kind = kThemeBevelButtonSmall;
else else
kind = kThemeBevelButton; kind = kThemeBevelButton;
@@ -500,4 +503,4 @@ wxRendererMac::DrawPushButton(wxWindow *win,
DrawMacThemeButton(win, dc, rect, flags, DrawMacThemeButton(win, dc, rect, flags,
kind, kThemeAdornmentNone); kind, kThemeAdornmentNone);
} }