(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 22a97cc03b66487da2d330ac30d9c655ada3a1b6..73b51d3cacd64958b4ffb6efda45def9fe652718 100644 (file)
--- 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
 }
 
 // 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
 
 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX

diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index f394ce44e2f8e751c25b20cd93e073ec8d4aa73d..533da4a07717674cb4b41957edd21c58a61a605b 100644 (file)
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -424,7 +424,9 @@ bool wxTextCtrl::MSWCreateText(const wxString& value,
         }
 #endif
 
         }
 #endif
 

+#if wxUSE_INKEDIT

         if (!IsInkEdit())
         if (!IsInkEdit())

+#endif // wxUSE_INKEDIT

         {
             if ( m_verRichEdit == 2 )
             {
         {
             if ( m_verRichEdit == 2 )
             {

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index b39db7f12ca1d5ce27ae46835355cb50335e5093..5e1b753ee73e498e56a8645f6df1cf755f3fafff 100644 (file)
--- 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)) )
         wchar_t buf[256];
         if ( ::SendMessage(GetEditHwnd(), EM_GETCUEBANNER,
                             (WPARAM)buf, WXSIZEOF(buf)) )

-            return buf;
+            return wxString(buf);

     }
 
     return wxTextEntryBase::GetHint();
     }
 
     return wxTextEntryBase::GetHint();

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index c33fade6f84c0c4a0a046bed9b9258493a4c9f12..1d49469169c793e2a7af9d12c299b710c0e8046b 100644 (file)
--- 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);
             }
                 return MSWHandleTreeKeyDownEvent(
                         info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);
             }

-            break;

 
 
         // Vista's tree control has introduced some problems with our
 
 
         // Vista's tree control has introduced some problems with our