From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 25 Apr 2009 14:07:38 +0000 (+0000)
Subject: (harmless) Borland release build warning fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d2f434e428869adfbf350f778374cb55ec341fde

(harmless) Borland release build warning fixes

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

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 22a97cc03b..73b51d3cac 100644
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -904,9 +904,13 @@ wxActiveXContainer::~wxActiveXContainer()
 }
 
 // VZ: we might want to really report an error instead of just asserting here
-#define CHECK_HR(hr) \
-    wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
-            wxString::Format("HRESULT = %X", (unsigned)(hr)) )
+#if wxDEBUG_LEVEL
+    #define CHECK_HR(hr) \
+        wxASSERT_LEVEL_2_MSG( SUCCEEDED(hr), \
+                wxString::Format("HRESULT = %X", (unsigned)(hr)) )
+#else
+    #define CHECK_HR(hr) wxUnusedVar(hr)
+#endif
 
 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index f394ce44e2..533da4a077 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -424,7 +424,9 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
         }
 #endif
 
+#if wxUSE_INKEDIT
         if (!IsInkEdit())
+#endif // wxUSE_INKEDIT
         {
             if ( m_verRichEdit == 2 )
             {
diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index b39db7f12c..5e1b753ee7 100644
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -451,7 +451,7 @@ wxString wxTextEntry::GetHint() const
         wchar_t buf[256];
         if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
                             (WPARAM)buf, WXSIZEOF(buf)) )
-            return buf;
+            return wxString(buf);
     }
 
     return wxTextEntryBase::GetHint();
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index c33fade6f8..1d49469169 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -3372,7 +3372,6 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 return MSWHandleTreeKeyDownEvent(
                         info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);
             }
-            break;
 
 
         // Vista's tree control has introduced some problems with our