don't draw borders for bitmap buttons with wxBORDER_NONE style

[wxWidgets.git] / include / wx / stringimpl.h

diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h
index e62127f06f96ddc236edc979484378003fc6669b..08880f3ebece8b1d20f3d9f28e6ae098dd46e843 100644 (file)
--- a/include/wx/stringimpl.h
+++ b/include/wx/stringimpl.h
@@ -341,23 +341,24 @@ public:
       { return wxStdString(c_str(), length()); }
 #endif
 
+#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
+    // disable warning about Unlock() below not being inlined (first, it
+    // seems to be inlined nevertheless and second, even if it isn't, there
+    // is nothing we can do about this
+    #pragma warning(push)
+    #pragma warning (disable:4714)
+#endif
 
     // dtor is not virtual, this class must not be inherited from!
   ~wxStringImpl()
   {
-#if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-      //RN - according to the above VC++ does indeed inline this,
-      //even though it spits out two warnings
-      #pragma warning (disable:4714)
-#endif
-
       GetStringData()->Unlock();
   }
 
 #if defined(__VISUALC__) && (__VISUALC__ >= 1200)
-    //re-enable inlining warning
-    #pragma warning (default:4714)
+    #pragma warning(pop)
 #endif
+
   // overloaded assignment
     // from another wxString
   wxStringImpl& operator=(const wxStringImpl& stringSrc);