don't crash when destroying a not initialized socket (patch 1489095)

[wxWidgets.git] / src / generic / datavgen.cpp

diff --git a/src/generic/datavgen.cpp b/src/generic/datavgen.cpp
index e84b872f4bfbbb1cfcf0001bff4dc400eb2eaf63..c9ca4db621cfc51f9e1a0ade0363547e85efddaf 100644 (file)
--- a/src/generic/datavgen.cpp
+++ b/src/generic/datavgen.cpp
@@ -10,6 +10,10 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+

 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"
 #if wxUSE_DATAVIEWCTRL
 
 #include "wx/dataview.h"


@@ -19,15 +23,15 @@
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/sizer.h"
     #include "wx/log.h"

+    #include "wx/dcclient.h"
+    #include "wx/timer.h"
+    #include "wx/settings.h"

 #endif
 
 #include "wx/stockitem.h"
 #endif
 
 #include "wx/stockitem.h"

-#include "wx/dcclient.h"

 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"
 #include "wx/calctrl.h"
 #include "wx/popupwin.h"
 #include "wx/renderer.h"

-#include "wx/timer.h"
-#include "wx/settings.h"

 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/wrapwin.h"


@@ -1142,7 +1146,7 @@ size_t wxDataViewMainWindow::GetLastVisibleRow()
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y );
 
     wxSize client_size = GetClientSize();
     m_owner->CalcUnscrolledPosition( client_size.x, client_size.y, &client_size.x, &client_size.y );
 

-    return wxMin( GetRowCount()-1, (client_size.y/m_lineHeight)+1 );
+    return wxMin( GetRowCount()-1, ((unsigned)client_size.y/m_lineHeight)+1 );

 }
 
 size_t wxDataViewMainWindow::GetRowCount()
 }
 
 size_t wxDataViewMainWindow::GetRowCount()