From 17867d61dcd061d3f39872446bc00c63d8a2a815 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Fri, 5 Mar 1999 12:40:11 +0000
Subject: [PATCH] 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 | 7 ++++---
src/generic/listctrl.cpp | 2 +-
src/generic/sashwin.cpp | 3 ++-
src/generic/splitter.cpp | 3 ++-
utils/tex2rtf/src/tex2rtf.cpp | 2 ++
5 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index f0bb51550b..e26ce2d35f 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -504,9 +504,10 @@ m_text(NULL), m_notebook(NULL)
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);
diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 600a0fccd6..ed1c2e255b 100644
--- 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->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 );
diff --git a/src/generic/sashwin.cpp b/src/generic/sashwin.cpp
index b0b0c19a6d..32a708730e 100644
--- 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);
-#else
+#endif
+#ifdef __WXMSW__
SetCursor(wxCursor());
#endif
diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp
index f5e8b79855..0288be3808 100644
--- 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);
-#else
+#endif
+#ifdef __WXMSW__
SetCursor(wxCursor());
#endif
diff --git a/utils/tex2rtf/src/tex2rtf.cpp b/utils/tex2rtf/src/tex2rtf.cpp
index b022776f6e..5e35432637 100644
--- 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 __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
\ No newline at end of file
--
2.47.2