*** empty log message ***

[wxWidgets.git] / src / msw / textctrl.cpp

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index e3930803b0502d00ee6993000b1ad208b98c7b06..6d55b5594910180ae1e010c8d51cb74b4ba4fa90 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -33,11 +33,12 @@
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"
     #include "wx/settings.h"
     #include "wx/brush.h"
     #include "wx/utils.h"

+    #include "wx/intl.h"

     #include "wx/log.h"
     #include "wx/log.h"

+    #include "wx/app.h"

 #endif
 
 #if wxUSE_CLIPBOARD
 #endif
 
 #if wxUSE_CLIPBOARD

-    #include "wx/app.h"

     #include "wx/clipbrd.h"
 #endif
 
     #include "wx/clipbrd.h"
 #endif
 


@@ -61,7 +62,6 @@
     #include <richedit.h>
 #endif
 
     #include <richedit.h>
 #endif
 

-#if !USE_SHARED_LIBRARY

 
 // ----------------------------------------------------------------------------
 // event tables and other macros
 
 // ----------------------------------------------------------------------------
 // event tables and other macros


@@ -86,7 +86,6 @@ BEGIN_EVENT_TABLE(wxTextCtrl, wxControl)
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(wxID_REDO, wxTextCtrl::OnUpdateRedo)
 END_EVENT_TABLE()
 

-#endif // USE_SHARED_LIBRARY

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -861,7 +860,7 @@ void wxTextCtrl::AdjustSpaceLimit()
 #ifndef __WIN16__
     unsigned int len = ::GetWindowTextLength(GetHwnd()),
     limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);
 #ifndef __WIN16__
     unsigned int len = ::GetWindowTextLength(GetHwnd()),
     limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);

-    if ( len > limit )
+    if ( len >= limit )

     {
         limit = len + 0x8000;    // 32Kb
 
     {
         limit = len + 0x8000;    // 32Kb