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

[ 1492036 ] Fix incorrect wxComboCtrl minimum size.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-05-20 23:27:12 +00:00
parent 8ef6d51ed7
commit 93f7f8be7e
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/generic/combog.cpp
View File

@@ -148,13 +148,13 @@ bool wxGenericComboControl::Create(wxWindow *parent,
// create main window // create main window
if ( !wxComboCtrlBase::Create(parent, if ( !wxComboCtrlBase::Create(parent,
id, id,
value, value,
wxDefaultPosition, pos,
wxDefaultSize, size,
style | wxFULL_REPAINT_ON_RESIZE, style | wxFULL_REPAINT_ON_RESIZE,
wxDefaultValidator, wxDefaultValidator,
name) ) name) )
return false; return false;
// Create textctrl, if necessary // Create textctrl, if necessary
@@ -166,8 +166,8 @@ bool wxGenericComboControl::Create(wxWindow *parent,
// Set background // Set background
SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering SetBackgroundStyle( wxBG_STYLE_CUSTOM ); // for double-buffering
// SetSize should be called last // SetBestSize should be called last
SetSize(pos.x,pos.y,size.x,size.y); SetBestSize(size);
return true; return true;
} }

22
src/msw/combo.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: combo.cpp // Name: src/msw/combo.cpp
// Purpose: wxMSW wxComboCtrl // Purpose: wxMSW wxComboCtrl
// Author: Jaakko Salli // Author: Jaakko Salli
// Modified by: // Modified by:
@@ -119,13 +119,13 @@ bool wxComboCtrl::Create(wxWindow *parent,
// create main window // create main window
if ( !wxComboCtrlBase::Create(parent, if ( !wxComboCtrlBase::Create(parent,
id, id,
value, value,
wxDefaultPosition, pos,
wxDefaultSize, size,
style | wxFULL_REPAINT_ON_RESIZE, style | wxFULL_REPAINT_ON_RESIZE,
wxDefaultValidator, wxDefaultValidator,
name) ) name) )
return false; return false;
if ( style & wxCC_STD_BUTTON ) if ( style & wxCC_STD_BUTTON )
@@ -140,8 +140,8 @@ bool wxComboCtrl::Create(wxWindow *parent,
// Prepare background for double-buffering // Prepare background for double-buffering
SetBackgroundStyle( wxBG_STYLE_CUSTOM ); SetBackgroundStyle( wxBG_STYLE_CUSTOM );
// SetSize should be called last // SetBestSize should be called last
SetSize(pos.x,pos.y,size.x,size.y); SetBestSize(size);
return true; return true;
} }
@@ -448,7 +448,7 @@ void wxComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
&r); &r);
drawButBg = false; drawButBg = false;
} }
// Standard button rendering // Standard button rendering
DrawButton(dc,rectb,drawButBg); DrawButton(dc,rectb,drawButBg);