X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e3eeddebdd4897428c0de576def883ac54f357c..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/src/msw/textentry.cpp diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp index 67e03be153..180ad1a40e 100644 --- a/src/msw/textentry.cpp +++ b/src/msw/textentry.cpp @@ -3,7 +3,6 @@ // Purpose: wxTextEntry implementation for wxMSW // Author: Vadim Zeitlin // Created: 2007-09-26 -// RCS-ID: $Id$ // Copyright: (c) 2007 Vadim Zeitlin // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -34,8 +33,6 @@ #include "wx/textcompleter.h" #include "wx/dynlib.h" -#include - #include "wx/msw/private.h" #if wxUSE_UXTHEME @@ -60,7 +57,7 @@ #if defined(__MINGW32__) || defined (__WATCOMC__) || defined(__CYGWIN__) // needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST - #include + //#include #ifndef ACO_AUTOAPPEND #define ACO_AUTOAPPEND 0x02 @@ -79,6 +76,11 @@ #define SHACF_FILESYS_DIRS 0x00000020 #endif +// This must be the last header included to only affect the DEFINE_GUID() +// occurrences below but not any GUIDs declared in the standard files included +// above. +#include + namespace { @@ -492,7 +494,7 @@ public: // wxEVT_CHAR handler (as we must also let the other handlers // defined at wx level run first). // - // Notice that we can't use wxEVT_COMMAND_TEXT_UPDATED here + // Notice that we can't use wxEVT_TEXT here // neither as, due to our use of ACO_AUTOAPPEND, we get // EN_CHANGE notifications from the control every time // IAutoComplete auto-appends something to it. @@ -956,9 +958,12 @@ bool wxTextEntry::DoSetMargins(const wxPoint& margins) if ( margins.x != -1 ) { - // left margin + // Set both horizontal margins to the given value, we don't distinguish + // between left and right margin at wx API level and it seems to be + // better to change both of them than only left one. ::SendMessage(GetEditHwnd(), EM_SETMARGINS, - EC_LEFTMARGIN, MAKELONG(margins.x, 0)); + EC_LEFTMARGIN | EC_RIGHTMARGIN, + MAKELONG(margins.x, margins.x)); } if ( margins.y != -1 )