Cured a bad assert in wxStatusBar; #ifdefed oleutils.cpp for VC++ 5.

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

diff --git a/samples/splitter/test.cpp b/samples/splitter/test.cpp
index 8a81d60befce70fef3720613fc4286e2db4bce8e..ba3732986c212cc3df7535ec5db8f9e4fd7f0966 100644 (file)
--- a/samples/splitter/test.cpp
+++ b/samples/splitter/test.cpp
@@ -120,6 +120,8 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
        SetIcon(wxIcon("aiai.xbm"));
 #endif
 
+       CreateStatusBar(1);
+
        // Make a menubar
        fileMenu = new wxMenu;
        fileMenu->Append(SPLIT_VERTICAL, "Split &Vertically", "Split vertically");
@@ -150,7 +152,6 @@ MyFrame::MyFrame(wxFrame* frame, const wxString& title, const wxPoint& pos, cons
 
     // Set this to prevent unsplitting
 //    splitter->SetMinimumPaneSize(20);
-    CreateStatusBar();
 }
 
 MyFrame::~MyFrame()
@@ -223,8 +224,13 @@ MyCanvas::~MyCanvas()
 
 void MyCanvas::OnDraw(wxDC& dc)
 {
+       dc.SetPen(*wxBLACK_PEN);
        dc.DrawLine(0, 0, 100, 100);
 
     dc.SetBackgroundMode(wxTRANSPARENT);
        dc.DrawText("Testing", 50, 50);
+
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(*wxGREEN_BRUSH);
+    dc.DrawRectangle(120, 120, 100, 80);
 }

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index c5daa74ee8bfd96366e6def43fb6bd7e6813a3c7..12b3dda1bca9f5437ad11c05bab1685a3c468c69 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -429,8 +429,8 @@ void wxSplitterWindow::DrawSash(wxDC& dc)
             dc.DrawLine(m_sashPosition+m_sashSize-2, 1, m_sashPosition+m_sashSize-2, h-1);
 
             dc.SetPen(*m_darkShadowPen);
-            dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
-        }
+                       dc.DrawLine(m_sashPosition+m_sashSize-1, 2, m_sashPosition+m_sashSize-1, h-2);
+               }
         else
         {
             dc.SetPen(*m_facePen);

diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp
index 400d4ef2193f274685e0a419186ff442217f1d87..0dd99fee23ccd76ed636514278afe0858a7ad914 100644 (file)
--- a/src/msw/dc.cpp
+++ b/src/msw/dc.cpp
@@ -70,7 +70,7 @@ wxDC::wxDC(void)
 {
   m_minX = 0; m_minY = 0; m_maxX = 0; m_maxY = 0;
   m_clipping = FALSE;
-  m_autoSetting = TRUE ;
+  m_autoSetting = FALSE ;
 
   m_filename = "";
   m_canvas = NULL;

diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp
index 92a16e713a189690e9303293392043e44021a846..b50b99c2c6ac035bb5a486efc41d899d3b537e06 100644 (file)
--- a/src/msw/ole/oleutils.cpp
+++ b/src/msw/ole/oleutils.cpp
@@ -41,7 +41,7 @@
 #include  <wx/msw/ole/uuid.h>
 #include  <wx/msw/ole/oleutils.h>
 
-#ifndef __BORLANDC__
+#if defined(_MSC_VER) && (_MSC_VER > 1000)
 #include  <docobj.h>
 #endif
 

diff --git a/src/msw/statbr95.cpp b/src/msw/statbr95.cpp
index 1e724c08a70ac4e2c6b651bb6c923c4e7144a065..efc4a698c8882c160e5fc502ddb59e19f5764985 100644 (file)
--- a/src/msw/statbr95.cpp
+++ b/src/msw/statbr95.cpp
@@ -211,11 +211,14 @@ void wxStatusBar95::SetStatusText(const wxString& strText, int nField)
 
 wxString wxStatusBar95::GetStatusText(int nField) const
 {
-  wxASSERT( (nField > 0) && (nField < m_nFields) );
+  wxASSERT( (nField > -1) && (nField < m_nFields) );
 
-  wxString str;
-  StatusBar_GetText(hwnd, nField, 
-                    str.GetWriteBuf(StatusBar_GetTextLen(hwnd, nField)));
+  wxString str("");
+  int len = StatusBar_GetTextLen(hwnd, nField);
+  if (len > 0)
+  {
+        StatusBar_GetText(hwnd, nField, str.GetWriteBuf(len));
+  }
   return str;
 }