From 8f3516688bc767146bd41c01d6277df5f6ada950 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 10 Feb 2005 16:35:12 +0000
Subject: [PATCH] Applied patch [ 1096612 ] FL: fix close button on wxGTK

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/include/wx/fl/toolwnd.h |  2 +-
 contrib/src/fl/toolwnd.cpp      | 34 +--------------------------------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/contrib/include/wx/fl/toolwnd.h b/contrib/include/wx/fl/toolwnd.h
index 8b90b2f130..e4c885cc3c 100644
--- a/contrib/include/wx/fl/toolwnd.h
+++ b/contrib/include/wx/fl/toolwnd.h
@@ -25,7 +25,7 @@
 
 #define BTN_BOX_HEIGHT       12
 #define BTN_BOX_WIDTH        12
-#define BTN_X_WIEGHT         2
+#define BTN_X_WEIGHT         2
 
 class WXDLLIMPEXP_FL cbMiniButton;
 
diff --git a/contrib/src/fl/toolwnd.cpp b/contrib/src/fl/toolwnd.cpp
index c3bd5c8876..1d3c2f0e8f 100644
--- a/contrib/src/fl/toolwnd.cpp
+++ b/contrib/src/fl/toolwnd.cpp
@@ -869,35 +869,6 @@ void cbMiniButton::Reset()
 
 void cbCloseBox::Draw( wxDC& dc )
 {
-#if defined(__WXGTK__) || defined(__WXX11__)
-
-    cbMiniButton::Draw( dc );
-
-    wxPen pen( wxColour( 64,64,64 ) ,1, wxSOLID );
-
-    dc.SetPen( pen );
-
-    int width = BTN_BOX_WIDTH - 7;
-
-    int xOfs = (mPressed) ? 4 : 3;
-    int yOfs = (mPressed) ? 4 : 3;
-
-    int one = 1;
-    for( int i = 0; i != BTN_X_WIEGHT; ++i )
-    {
-        dc.DrawLine( mPos.x + xOfs + i - one,
-                     mPos.y + yOfs - one,
-                     mPos.x + xOfs + i + width,
-                     mPos.y + yOfs + width  + one);
-
-        dc.DrawLine( mPos.x + xOfs + i + width ,
-                     mPos.y + yOfs - one - one,
-                     mPos.x + xOfs + i - one,
-                     mPos.y + yOfs + width );
-    }
-
-#else
-
     cbMiniButton::Draw( dc );
 
     dc.SetPen( *wxBLACK_PEN );
@@ -907,7 +878,7 @@ void cbCloseBox::Draw( wxDC& dc )
     int xOfs = (mPressed) ? 4 : 3;
     int yOfs = (mPressed) ? 4 : 3;
 
-    for( int i = 0; i != BTN_X_WIEGHT; ++i )
+    for( int i = 0; i != BTN_X_WEIGHT; ++i )
     {
         dc.DrawLine( mPos.x + xOfs + i,
                      mPos.y + yOfs,
@@ -919,9 +890,6 @@ void cbCloseBox::Draw( wxDC& dc )
                      mPos.x + xOfs + i - 1,
                      mPos.y + yOfs + width );
     }
-
-#endif
-
 }
 
 /***** Implementation fro class cbCollapseBox *****/