gtk wxStaticText and wxALIGN_CENTER_VERTICAL

[wxWidgets.git] / src / common / uri.cpp

diff --git a/src/common/uri.cpp b/src/common/uri.cpp
index 5ddfbc3cbc88806824fbf2ef1b75ba9a814dbee3..7ddc18d1dd1c3ba33b470b0b23528c90d5d87b4e 100644 (file)
--- a/src/common/uri.cpp
+++ b/src/common/uri.cpp
@@ -23,6 +23,10 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#ifndef WX_PRECOMP
+    #include "wx/crt.h"
+#endif
+

 #include "wx/uri.h"
 
 // ---------------------------------------------------------------------------
 #include "wx/uri.h"
 
 // ---------------------------------------------------------------------------


@@ -644,10 +648,6 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali
         if (bNormalize)
         {
             wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
         if (bNormalize)
         {
             wxStringBufferLength theBuffer(m_path, m_path.length() + 1);

-#if wxUSE_STL || wxUSE_UNICODE_UTF8
-            // FIXME-UTF8: have some wxReadWriteStringBuffer instead?
-            wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
-#endif

             Normalize(theBuffer, true);
             theBuffer.SetLength(wxStrlen(theBuffer));
         }
             Normalize(theBuffer, true);
             theBuffer.SetLength(wxStrlen(theBuffer));
         }


@@ -697,10 +697,6 @@ const wxChar* wxURI::ParsePath(const wxChar* uri, bool bReference, bool bNormali
             if (bNormalize)
             {
                 wxStringBufferLength theBuffer(m_path, m_path.length() + 1);
             if (bNormalize)
             {
                 wxStringBufferLength theBuffer(m_path, m_path.length() + 1);

-#if wxUSE_STL || wxUSE_UNICODE_UTF8
-                // FIXME-UTF8: have some wxReadWriteStringBuffer instead?
-                wxTmemcpy(theBuffer, m_path.c_str(), m_path.length()+1);
-#endif

                 Normalize(theBuffer);
                 theBuffer.SetLength(wxStrlen(theBuffer));
             }
                 Normalize(theBuffer);
                 theBuffer.SetLength(wxStrlen(theBuffer));
             }