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

Applied patch [ 1170019 ] Fix for wxGTK drop button in datectlg.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-03-24 17:34:42 +00:00
parent 6be3205071
commit 7e24348eb8
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/datectlg.cpp
View File

@@ -78,9 +78,9 @@ enum
#define TXTCTRL_FLAGS wxNO_BORDER #define TXTCTRL_FLAGS wxNO_BORDER
#define BTN_FLAGS wxNO_BORDER #define BTN_FLAGS wxNO_BORDER
#define CALBORDER 0 #define CALBORDER 0
#define RIGHTBUTTONBORDER 3 #define RIGHTBUTTONBORDER 4
#define TOPBUTTONBORDER 0 #define TOPBUTTONBORDER 0
#define BUTTONBORDER 3 #define BUTTONBORDER 4
#define TXTPOSY 1 #define TXTPOSY 1
#else #else
#define TXTCTRL_FLAGS 0 #define TXTCTRL_FLAGS 0
@@ -184,26 +184,29 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
if (h < 0) if (h < 0)
h = GetSize().y; h = GetSize().y;
int bw = w - m_marginX - m_borderX; int borderX = m_marginX + m_borderX;
int bh = h - m_marginY - m_borderY; int borderY = m_marginY + m_borderY;
int bw = w - borderX;
int bh = h - borderY;
if (bh < 11) bh=11; if (bh < 11) bh=11;
if (bw < 9) bw=9; if (bw < 9) bw=9;
wxBitmap bmp(bw, bh); wxBitmap bmp(bw, bh);
dc.SelectObject(bmp); dc.SelectObject(bmp);
wxRect r(0,0,bw, bh);
wxRendererNative& renderer = wxRendererNative::Get(); wxRendererNative& renderer = wxRendererNative::Get();
#ifdef __WXGTK__ #ifdef __WXGTK__
wxRect r(-(borderX/2),-(borderY/2),w,h);
wxColour magic(255,0,255); wxColour magic(255,0,255);
dc.SetBrush( wxBrush( magic ) ); dc.SetBrush( wxBrush( magic ) );
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle(0,0,bw,bh); dc.DrawRectangle(0,0,bw,bh);
renderer.DrawComboBoxDropButton(this, dc, r); renderer.DrawDropArrow(this, dc, r);
wxMask *mask = new wxMask( bmp, magic ); wxMask *mask = new wxMask( bmp, magic );
bmp.SetMask( mask ); bmp.SetMask( mask );
#else #else
wxRect r(0,0,bw,bh);
renderer.DrawComboBoxDropButton(this, dc, r); renderer.DrawComboBoxDropButton(this, dc, r);
#endif #endif
SetBitmapLabel(bmp); SetBitmapLabel(bmp);
@@ -215,7 +218,7 @@ void wxDropdownButton::DoMoveWindow(int x, int y, int w, int h)
dc.SetBrush( wxBrush( magic ) ); dc.SetBrush( wxBrush( magic ) );
dc.SetPen( *wxTRANSPARENT_PEN ); dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle(0,0,bw,bh); dc.DrawRectangle(0,0,bw,bh);
renderer.DrawComboBoxDropButton(this, dc, r, wxCONTROL_PRESSED); renderer.DrawDropArrow(this, dc, r, wxCONTROL_PRESSED);
mask = new wxMask( bmpSel, magic ); mask = new wxMask( bmpSel, magic );
bmpSel.SetMask( mask ); bmpSel.SetMask( mask );
#else #else