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

correct access for virtual, declare variable only if used

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-07 08:59:19 +00:00
parent 80a91c146a
commit d7e15728ea
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/combocmn.cpp
View File

@@ -355,6 +355,7 @@ public:
#if USES_WXPOPUPTRANSIENTWINDOW #if USES_WXPOPUPTRANSIENTWINDOW
virtual bool Show( bool show ); virtual bool Show( bool show );
virtual bool ProcessLeftDown(wxMouseEvent& event); virtual bool ProcessLeftDown(wxMouseEvent& event);
protected:
virtual void OnDismiss(); virtual void OnDismiss();
#endif #endif
@@ -1003,9 +1004,10 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
if ( !m_text ) if ( !m_text )
return; return;
#if !TEXTCTRL_TEXT_CENTERED
wxSize sz = GetClientSize(); wxSize sz = GetClientSize();
#if !TEXTCTRL_TEXT_CENTERED
int customBorder = m_widthCustomBorder; int customBorder = m_widthCustomBorder;
if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER ) if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
{ {