wxTextEntry::SetMargins(), GetMargins() - implemented on wxMSW and wxGTK (GTK+ 2.10+); also added similar functions into wxComboCtrl, deprecated old indent-functions; wxPropertyGrid modified to use the new functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -64,10 +64,6 @@
 | 
			
		||||
#include "wx/timer.h"
 | 
			
		||||
#include "wx/dcbuffer.h"
 | 
			
		||||
 | 
			
		||||
#ifdef __WXMSW__
 | 
			
		||||
    #include "wx/msw/private.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
// Two pics for the expand / collapse buttons.
 | 
			
		||||
// Files are not supplied with this project (since it is
 | 
			
		||||
// recommended to use either custom or native rendering).
 | 
			
		||||
@@ -3867,18 +3863,6 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
 | 
			
		||||
                    if ( (p->m_flags & wxPG_PROP_MODIFIED) && (m_windowStyle & wxPG_BOLD_MODIFIED) )
 | 
			
		||||
                        SetCurControlBoldFont();
 | 
			
		||||
 | 
			
		||||
                    //
 | 
			
		||||
                    // Fix TextCtrl indentation
 | 
			
		||||
                #if defined(__WXMSW__) && !defined(__WXWINCE__)
 | 
			
		||||
                    wxTextCtrl* tc = NULL;
 | 
			
		||||
                    if ( primaryCtrl->IsKindOf(CLASSINFO(wxOwnerDrawnComboBox)) )
 | 
			
		||||
                        tc = ((wxOwnerDrawnComboBox*)primaryCtrl)->GetTextCtrl();
 | 
			
		||||
                    else
 | 
			
		||||
                        tc = wxDynamicCast(primaryCtrl, wxTextCtrl);
 | 
			
		||||
                    if ( tc )
 | 
			
		||||
                        ::SendMessage(GetHwndOf(tc), EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));
 | 
			
		||||
                #endif
 | 
			
		||||
 | 
			
		||||
                    // Store x relative to splitter (we'll need it).
 | 
			
		||||
                    m_ctrlXAdjust = m_wndEditor->GetPosition().x - splitterX;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user