Two optical corrections

#ifdeffed the cursor code in splitter and sash
  Made tex2rtf compile

  I will release this as 2.0.1


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

samples/controls/controls.cpp

@@ -504,9 +504,10 @@ m_text(NULL), m_notebook(NULL)
 
     wxString choices2[] =
     {
-        "First", "Second", "Third",
+        "First", "Second",
-        "Fourth", "Fifth", //"Sixth",
+	/* "Third",
-        //"Seventh", "Eighth", "Nineth", "Tenth"
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */
     };
 
     panel = new wxPanel(m_notebook);

src/generic/listctrl.cpp

@@ -713,7 +713,7 @@ void wxListHeaderWindow::DoDrawRect( wxDC *dc, int x, int y, int w, int h )
 
     dc->SetPen( *wxBLACK_PEN );
     dc->DrawLine( x+w-m_corner+1, y, x+w, y+h );  // right (outer)
-    dc->DrawRectangle( x, y+h, w, 1 );            // bottom (outer)
+    dc->DrawRectangle( x, y+h, w+1, 1 );          // bottom (outer)
 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
   

src/generic/sashwin.cpp

@@ -113,7 +113,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);
-#else
+#endif
+#ifdef __WXMSW__
     SetCursor(wxCursor());
 #endif
 

src/generic/splitter.cpp

@@ -148,7 +148,8 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);
-#else
+#endif
+#ifdef __WXMSW__
     SetCursor(wxCursor());
 #endif
 

utils/tex2rtf/src/tex2rtf.cpp

@@ -1084,6 +1084,7 @@ char *Tex2RTFConnection::OnRequest(const wxString& topic, const wxString& item,
 
 
 #ifndef NO_GUI
+#ifndef __WXGTK__
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
@@ -1091,4 +1092,5 @@ void wxObject::Dump(ostream& str)
   else
     str << "unknown object class";
 }
+#endif
 #endif