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

diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index f0bb51550bbcc95e0c48ea4642bd26ab1951320f..e26ce2d35ffd6610580dd7dfff6abbdab641b0c7 100644 (file)
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -504,9 +504,10 @@ m_text(NULL), m_notebook(NULL)
 
     wxString choices2[] =
     {
 
     wxString choices2[] =
     {

-        "First", "Second", "Third",
-        "Fourth", "Fifth", //"Sixth",
-        //"Seventh", "Eighth", "Nineth", "Tenth"
+        "First", "Second",
+       /* "Third",
+        "Fourth", "Fifth", "Sixth",
+        "Seventh", "Eighth", "Nineth", "Tenth" */

     };
 
     panel = new wxPanel(m_notebook);
     };
 
     panel = new wxPanel(m_notebook);

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 600a0fccd61221fbcbefbaf0cb941353f21bdd9b..ed1c2e255b19ee191a45e3fabaf1127506e48818 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/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->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 );
   
 
     wxPen pen( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_BTNSHADOW ), 1, wxSOLID );
   

diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index b0b0c19a6d1bd23f81567f13fbccfd478709b21f..32a708730e400980764de716efeeea10e41448d5 100644 (file)
--- a/src/generic/sashwin.cpp
+++ b/src/generic/sashwin.cpp
@@ -113,7 +113,8 @@ void wxSashWindow::OnMouseEvent(wxMouseEvent& event)
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);

-#else
+#endif
+#ifdef __WXMSW__

     SetCursor(wxCursor());
 #endif
 
     SetCursor(wxCursor());
 #endif
 

diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index f5e8b7985574da315dd73d5bd90d35a16d02eb0d..0288be38082da7f81637aa293200108db10c484f 100644 (file)
--- a/src/generic/splitter.cpp
+++ b/src/generic/splitter.cpp
@@ -148,7 +148,8 @@ void wxSplitterWindow::OnMouseEvent(wxMouseEvent& event)
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);
     // reset the cursor
 #ifdef __WXMOTIF__
     SetCursor(* wxSTANDARD_CURSOR);

-#else
+#endif
+#ifdef __WXMSW__

     SetCursor(wxCursor());
 #endif
 
     SetCursor(wxCursor());
 #endif
 

diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index b022776f6e5d2eee35b397030a6653bdd148f847..5e35432637fe4a81b535bb90d18dfe20618b96d4 100644 (file)
--- a/utils/tex2rtf/src/tex2rtf.cpp
+++ b/utils/tex2rtf/src/tex2rtf.cpp
@@ -1084,6 +1084,7 @@ char *Tex2RTFConnection::OnRequest(const wxString& topic, const wxString& item,
 
 
 #ifndef NO_GUI
 
 
 #ifndef NO_GUI

+#ifndef __WXGTK__

 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())
 void wxObject::Dump(ostream& str)
 {
   if (GetClassInfo() && GetClassInfo()->GetClassName())


@@ -1091,4 +1092,5 @@ void wxObject::Dump(ostream& str)
   else
     str << "unknown object class";
 }
   else
     str << "unknown object class";
 }

+#endif

 #endif
\ No newline at end of file
 #endif
\ No newline at end of file