Misc small mods

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

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 01a6aab5affda7b6309c914e36d0eaf36bb3a62d..6dd50ddd826afa0239c8925c06e7ad59ea9465ed 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -107,7 +107,7 @@ unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
-unzip32 -o ..\tex2rtf3.zip
+unzip32 -o ..\tex2rtf2.zip
 
 rem Now delete a few files that are unnecessary
 erase /Y *.in *.spec *.guess *.sub mkinstalldirs modules install-sh *.sh

diff --git a/docs/bugs.txt b/docs/bugs.txt
index b4cdcfd309b7ea60b23a5daf5f4a508200c567cf..565e82771f43a3fe530a4a16026619ec2ae58245 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -240,8 +240,7 @@ zero-based in MSW wxFileDialog implementation
 IDENTIFIED+BY: Haneef Mohammed
 PLATFORMS: wxMSW
 SHORT+DESCRIPTION: Bug in wxDocTemplate::SelectDocumentPath()
-Submit: Submit
-WORKAROUND: 
+WORKAROUND:
 visitor_email_address: haneef@symphonyeda.com
 wxWINDOWS+VERSION: 2.1.12
 DATE+FIXED: 29/11/99
@@ -267,7 +266,6 @@ FIXED+BY: Vadim, just after 2.1.11?
 IDENTIFIED+BY: Tom Marshall
 PLATFORMS: wxGTK
 SHORT+DESCRIPTION: wxGTK: infinite recursion in font selection
-Submit: Submit
 WORKAROUND: Create default font mapping for every
 wxGTK app (?)
 visitor_email_address: tommy@aa.net
@@ -282,12 +280,23 @@ FIXED+BY:
 IDENTIFIED+BY: Tom Marshall
 PLATFORMS: wxGTK
 SHORT+DESCRIPTION: wxGTK: wxsocket example crashes if listen socket unavailable
-Submit: Submit
 WORKAROUND: None.
 visitor_email_address: tommy@aa.net
 wxWINDOWS+VERSION: 2.1.11
 
-
+DATE+FIXED: 07/12/1999
+DATE+IDENTIFIED: 04/12/1999
+DETAILS: In wxTextCtrl::AdjustSpaceLimit(), the check for len > limit
+does not take into account when len == limit. This caused the
+output to freeze when the limit was reached.
+FIXED+BY: Vasu Harish
+IDENTIFIED+BY: Vasu Harish
+PLATFORMS: wxMSW
+SHORT+DESCRIPTION: wxTextCtrl clogs output occassionally when the text size limit is reached
+WORKAROUND: In the check for (len > limit) condition in wxTextCtrl::AdjustSpaceLimit()
+call, added the condition to check for the len==limit. 
+visitor_email_address: vasuh@bullant.net
+wxWINDOWS+VERSION: wx2.1.11
 
 
 ---------------------------END OF BUGLIST-------------------------

diff --git a/src/common/hash.cpp b/src/common/hash.cpp
index fbee85aceb619cce06625fec8cb3dbbfb793509e..3c514d498c9e8bd2b96e876ff36ef8bbd21c6f46 100644 (file)
--- a/src/common/hash.cpp
+++ b/src/common/hash.cpp
@@ -33,6 +33,10 @@ IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
 
 wxHashTable::wxHashTable (int the_key_type, int size)
 {
+  n = 0;
+  hash_table = (wxList**) NULL;
+  Create(the_key_type, size);
+/*
   n = size;
   current_position = -1;
   current_node = (wxNode *) NULL;
@@ -42,6 +46,7 @@ wxHashTable::wxHashTable (int the_key_type, int size)
   int i;
   for (i = 0; i < size; i++)
     hash_table[i] = (wxList *) NULL;
+*/
 }
 
 wxHashTable::~wxHashTable (void)
@@ -62,13 +67,13 @@ void wxHashTable::Destroy(void)
 
 bool wxHashTable::Create(int the_key_type, int size)
 {
+  Destroy();
+
   n = size;
   current_position = -1;
   current_node = (wxNode *) NULL;
 
   key_type = the_key_type;
-  if (hash_table)
-    delete[] hash_table;
   hash_table = new wxList *[size];
   int i;
   for (i = 0; i < size; i++)

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 458cb8f4c800e9b10afef106406e80b2ee433073..6d55b5594910180ae1e010c8d51cb74b4ba4fa90 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -860,7 +860,7 @@ void wxTextCtrl::AdjustSpaceLimit()
 #ifndef __WIN16__
     unsigned int len = ::GetWindowTextLength(GetHwnd()),
     limit = ::SendMessage(GetHwnd(), EM_GETLIMITTEXT, 0, 0);
-    if ( len > limit )
+    if ( len >= limit )
     {
         limit = len + 0x8000;    // 32Kb
 

diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index e8ab34de913e6316dce361f61fd7a85730244fef..095186e09fe4a5c2a8710073ce0cc5b0f7198c69 100644 (file)
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -771,6 +771,10 @@ SOURCE=.\msw\dibutils.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\dir.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File

diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 83e09e0c0c36288da8a7328d80580cf0187e61a4..279c780eb214a7ebe39a4f4225d346247daea4c9 100644 (file)
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -761,6 +761,10 @@ SOURCE=.\msw\dibutils.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\dir.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\dirdlg.cpp
 # End Source File
 # Begin Source File