]> git.saurik.com Git - wxWidgets.git/commitdiff
correct access for virtual, declare variable only if used
authorPaul Cornett <paulcor@bullseye.com>
Thu, 7 Dec 2006 08:59:19 +0000 (08:59 +0000)
committerPaul Cornett <paulcor@bullseye.com>
Thu, 7 Dec 2006 08:59:19 +0000 (08:59 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/combocmn.cpp

index 77c67f137e9431537eb500c4e1963f9e1fb1f26e..f47619998ea5541fdafc8f0544e9a0452941b9bd 100644 (file)
@@ -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 )
     {