From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 7 Dec 2006 08:59:19 +0000 (+0000)
Subject: correct access for virtual, declare variable only if used
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d7e15728ea9a8d03101600a8c7863896607c3f0b

correct access for virtual, declare variable only if used


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 77c67f137e..f47619998e 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -355,6 +355,7 @@ public:
 #if USES_WXPOPUPTRANSIENTWINDOW
     virtual bool Show( bool show );
     virtual bool ProcessLeftDown(wxMouseEvent& event);
+protected:
     virtual void OnDismiss();
 #endif
 
@@ -1003,9 +1004,10 @@ void wxComboCtrlBase::PositionTextCtrl( int textCtrlXAdjust, int textCtrlYAdjust
     if ( !m_text )
         return;
 
+#if !TEXTCTRL_TEXT_CENTERED
+
     wxSize sz = GetClientSize();
 
-#if !TEXTCTRL_TEXT_CENTERED
     int customBorder = m_widthCustomBorder;
     if ( (m_text->GetWindowStyleFlag() & wxBORDER_MASK) == wxNO_BORDER )
     {