Second part of '[ 1216148 ] cleanup: unused variables and declarations'.

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

src/gtk/dcclient.cpp

@@ -143,8 +143,6 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
 // Implement Pool of Graphic contexts. Creating them takes too much time.
 //-----------------------------------------------------------------------------
 
-#define GC_POOL_SIZE 200
-
 enum wxPoolGCType
 {
    wxGC_ERROR = 0,

src/gtk/dialog.cpp

@@ -26,11 +26,9 @@
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
-// idle system
+// global data
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
@@ -49,9 +47,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 void wxDialog::Init()
 {
     m_returnCode = 0;
-    m_sizeSet = FALSE;
+    m_sizeSet = false;
-    m_modalShowing = FALSE;
+    m_modalShowing = false;
-    m_themeEnabled = TRUE;
+    m_themeEnabled = true;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -92,7 +90,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
     else
     {
         SetReturnCode(wxID_CANCEL);
-        Show(FALSE);
+        Show(false);
     }
 }
 
@@ -107,7 +105,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
         else
         {
             SetReturnCode(wxID_OK);
-            Show(FALSE);
+            Show(false);
         }
     }
 }
@@ -205,11 +203,11 @@ int wxDialog::ShowModal()
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
 
-    Show( TRUE );
+    Show( true );
 
     SetFocus();
 
-    m_modalShowing = TRUE;
+    m_modalShowing = true;
 
     g_openDialogs++;
 
@@ -232,9 +230,9 @@ void wxDialog::EndModal( int retCode )
         return;
     }
 
-    m_modalShowing = FALSE;
+    m_modalShowing = false;
 
     gtk_main_quit();
 
-    Show( FALSE );
+    Show( false );
 }

src/gtk/filedlg.cpp

@@ -39,7 +39,6 @@
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button

src/gtk/frame.cpp

@@ -58,7 +58,6 @@ const int wxPLACE_HOLDER   = 0;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
-extern int g_openDialogs;
 
 // ----------------------------------------------------------------------------
 // event tables
@@ -85,7 +84,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 {
     if (!win->m_hasVMT) return;
 
-    win->m_menuBarDetached = FALSE;
+    win->m_menuBarDetached = false;
     win->GtkUpdateSize();
 }
 }
@@ -105,7 +104,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
     // Raise the client area area
     gdk_window_raise( win->m_wxwindow->window );
 
-    win->m_menuBarDetached = TRUE;
+    win->m_menuBarDetached = true;
     win->GtkUpdateSize();
 }
 }
@@ -122,7 +121,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 {
     if (!win->m_hasVMT) return;
 
-    win->m_toolBarDetached = FALSE;
+    win->m_toolBarDetached = false;
     win->GtkUpdateSize();
 }
 }
@@ -142,7 +141,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
     // Raise the client area area
     gdk_window_raise( win->m_wxwindow->window );
 
-    win->m_toolBarDetached = TRUE;
+    win->m_toolBarDetached = true;
     win->GtkUpdateSize();
 }
 }
@@ -215,8 +214,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
 void wxFrame::Init()
 {
-    m_menuBarDetached = FALSE;
+    m_menuBarDetached = false;
-    m_toolBarDetached = FALSE;
+    m_toolBarDetached = false;
     m_menuBarHeight = 2;
 }
 
@@ -237,7 +236,7 @@ bool wxFrame::Create( wxWindow *parent,
 
 wxFrame::~wxFrame()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
     DeleteAllBars();
 }
 
@@ -352,7 +351,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
 
     // avoid recursions
     if (m_resizing) return;
-    m_resizing = TRUE;
+    m_resizing = true;
 
     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
@@ -498,7 +497,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -515,7 +514,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxFrame::OnInternalIdle()
@@ -641,11 +640,11 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    m_insertInClientArea = FALSE;
+    m_insertInClientArea = false;
 
     m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
 
-    m_insertInClientArea = TRUE;
+    m_insertInClientArea = true;
 
     GtkUpdateSize();
 

src/gtk/renderer.cpp

@@ -42,6 +42,11 @@
     #define WXUNUSED_IN_GTK1(arg)
 #endif
 
+// RR: After a correction to the orientation of the sash
+//     this doesn't seem to be required anymore and it
+//     seems to confuse some themes so USE_ERASE_RECT=0
+#define USE_ERASE_RECT 0
+
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
@@ -289,7 +294,10 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
+#if USE_ERASE_RECT
     GdkRectangle erase_rect;
+#endif
+
     if ( isVert )
     {
         int h = win->GetClientSize().GetHeight();
@@ -299,10 +307,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.width = full_size;
         rect.height = h;
 
+#if USE_ERASE_RECT
         erase_rect.x = position;
         erase_rect.y = 0;
         erase_rect.width = full_size;
         erase_rect.height = h;
+#endif
     }
     else // horz
     {
@@ -313,17 +323,15 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.height = full_size;
         rect.width = w;
 
+#if USE_ERASE_RECT
         erase_rect.y = position;
         erase_rect.x = 0;
         erase_rect.height = full_size;
         erase_rect.width = w;
+#endif
     }
 
-#if 0
+#if USE_ERASE_RECT
-    // RR: After a correction to the orientation of the sash
-    //     this doesn't seem to be required anymore and it
-    //     seems to confuse some themes
-
     // we must erase everything first, otherwise the garbage
     // from the old sash is left when dragging it
     gtk_paint_flat_box

src/gtk/scrolbar.cpp

@@ -35,7 +35,6 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
 static wxEventType g_currentUpDownEvent = wxEVT_NULL;
 
 static const float sensitivity = 0.02;
@@ -157,7 +156,7 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
         win->GetEventHandler()->ProcessEvent( event );
     }
 
-    win->m_isScrolling = FALSE;
+    win->m_isScrolling = false;
 
     // reset the LINEUP/LINEDOWN flag when the mouse button is released
     g_currentUpDownEvent = wxEVT_NULL;
@@ -180,14 +179,14 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
-    m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_oldPos = 0.0;
@@ -216,7 +215,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 int wxScrollBar::GetThumbPosition() const

src/gtk/tbargtk.cpp

@@ -32,8 +32,6 @@
 #include <glib.h>
 #include "wx/gtk/private.h"
 
-extern GdkFont *GtkGetDefaultGuiFont();
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -271,7 +269,7 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 void wxToolBar::Init()
 {
     m_toolbar = (GtkToolbar *)NULL;
-    m_blockEvent = FALSE;
+    m_blockEvent = false;
     m_defaultWidth = 32;
     m_defaultHeight = 32;
 }
@@ -287,7 +285,7 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||
@@ -295,7 +293,7 @@ bool wxToolBar::Create( wxWindow *parent,
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
-        return FALSE;
+        return false;
     }
 
 #ifdef __WXGTK20__
@@ -344,7 +342,7 @@ bool wxToolBar::Create( wxWindow *parent,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 void wxToolBar::GtkSetStyle()
@@ -383,13 +381,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 
-            wxCHECK_MSG( bitmap.Ok(), FALSE,
+            wxCHECK_MSG( bitmap.Ok(), false,
                          wxT("invalid bitmap for wxToolBar icon") );
 
-            wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
                          wxT("wxToolBar doesn't support GdkBitmap") );
 
-            wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
                          wxT("wxToolBar::Add needs a wxBitmap") );
 
             GtkWidget *tool_pixmap = (GtkWidget *)NULL;
@@ -452,7 +450,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync
-                        tool->Toggle(TRUE);
+                        tool->Toggle(true);
                     }
                 }
 
@@ -478,7 +476,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 {
                     wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
 
-                    return FALSE;
+                    return false;
                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),
@@ -496,7 +494,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
             gtk_toolbar_insert_space( m_toolbar, posGtk );
 
             // skip the rest
-            return TRUE;
+            return true;
 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(
@@ -516,7 +514,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     m_height = req.height + 2*m_yMargin;
     InvalidateBestSize();
 
-    return TRUE;
+    return true;
 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
@@ -541,7 +539,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
     }
 
     InvalidateBestSize();
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -567,11 +565,11 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
     {
         tool->SetPixmap(tool->GetBitmap());
 
-        m_blockEvent = TRUE;
+        m_blockEvent = true;
 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
 
-        m_blockEvent = FALSE;
+        m_blockEvent = false;
     }
 }
 

src/gtk/textctrl.cpp

@@ -42,7 +42,6 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 

src/gtk/tglbtn.cpp

@@ -24,7 +24,6 @@ extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;
 
 extern "C" {
 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
@@ -59,16 +58,16 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
-    m_needParent = TRUE;
+    m_needParent = true;
-    m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
-    m_blockEvent = FALSE;
+    m_blockEvent = false;
 
     if (!PreCreation(parent, pos, size) ||
        !CreateBase(parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
-        return FALSE;
+        return false;
     }
 
     m_bitmap = label;
@@ -92,7 +91,7 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 // void SetValue(bool state)
@@ -104,18 +103,18 @@ void wxToggleBitmapButton::SetValue(bool state)
     if (state == GetValue())
         return;
 
-   m_blockEvent = TRUE;
+    m_blockEvent = true;
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleBitmapButton::GetValue() const
 {
-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
 
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
@@ -152,14 +151,14 @@ void wxToggleBitmapButton::OnSetBitmap()
     }
 }
 
-bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
 {
     if (!wxControl::Enable(enable))
-        return FALSE;
+        return false;
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
-    return TRUE;
+    return true;
 }
 
 void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -232,15 +231,15 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
-   m_needParent = TRUE;
+    m_needParent = true;
-   m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 
     if (!PreCreation(parent, pos, size) ||
         !CreateBase(parent, id, pos, size, style, validator, name )) {
         wxFAIL_MSG(wxT("wxToggleButton creation failed"));
-      return FALSE;
+        return false;
     }
 
     wxControl::SetLabel(label);
@@ -256,7 +255,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-   return TRUE;
+    return true;
 }
 
 // void SetValue(bool state)
@@ -268,18 +267,18 @@ void wxToggleButton::SetValue(bool state)
     if (state == GetValue())
         return;
 
-   m_blockEvent = TRUE;
+    m_blockEvent = true;
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleButton::GetValue() const
 {
-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
 
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
@@ -293,14 +292,14 @@ void wxToggleButton::SetLabel(const wxString& label)
     gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
 }
 
-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleButton::Enable(bool enable /*=true*/)
 {
     if (!wxControl::Enable(enable))
-        return FALSE;
+        return false;
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
-    return TRUE;
+    return true;
 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)

src/gtk1/dcclient.cpp

@@ -143,8 +143,6 @@ void gdk_wx_draw_bitmap(GdkDrawable  *drawable,
 // Implement Pool of Graphic contexts. Creating them takes too much time.
 //-----------------------------------------------------------------------------
 
-#define GC_POOL_SIZE 200
-
 enum wxPoolGCType
 {
    wxGC_ERROR = 0,

src/gtk1/dialog.cpp

@@ -26,11 +26,9 @@
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
-// idle system
+// global data
 //-----------------------------------------------------------------------------
 
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 extern int g_openDialogs;
 
 //-----------------------------------------------------------------------------
@@ -49,9 +47,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxDialog,wxTopLevelWindow)
 void wxDialog::Init()
 {
     m_returnCode = 0;
-    m_sizeSet = FALSE;
+    m_sizeSet = false;
-    m_modalShowing = FALSE;
+    m_modalShowing = false;
-    m_themeEnabled = TRUE;
+    m_themeEnabled = true;
 }
 
 wxDialog::wxDialog( wxWindow *parent,
@@ -92,7 +90,7 @@ void wxDialog::OnCancel( wxCommandEvent &WXUNUSED(event) )
     else
     {
         SetReturnCode(wxID_CANCEL);
-        Show(FALSE);
+        Show(false);
     }
 }
 
@@ -107,7 +105,7 @@ void wxDialog::OnOK( wxCommandEvent &WXUNUSED(event) )
         else
         {
             SetReturnCode(wxID_OK);
-            Show(FALSE);
+            Show(false);
         }
     }
 }
@@ -205,11 +203,11 @@ int wxDialog::ShowModal()
 
     wxBusyCursorSuspender cs; // temporarily suppress the busy cursor
 
-    Show( TRUE );
+    Show( true );
 
     SetFocus();
 
-    m_modalShowing = TRUE;
+    m_modalShowing = true;
 
     g_openDialogs++;
 
@@ -232,9 +230,9 @@ void wxDialog::EndModal( int retCode )
         return;
     }
 
-    m_modalShowing = FALSE;
+    m_modalShowing = false;
 
     gtk_main_quit();
 
-    Show( FALSE );
+    Show( false );
 }

src/gtk1/filedlg.cpp

@@ -39,7 +39,6 @@
 //-----------------------------------------------------------------------------
 
 extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
 
 //-----------------------------------------------------------------------------
 // "clicked" for OK-button

src/gtk1/frame.cpp

@@ -58,7 +58,6 @@ const int wxPLACE_HOLDER   = 0;
 
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
-extern int g_openDialogs;
 
 // ----------------------------------------------------------------------------
 // event tables
@@ -85,7 +84,7 @@ static void gtk_menu_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
 {
     if (!win->m_hasVMT) return;
 
-    win->m_menuBarDetached = FALSE;
+    win->m_menuBarDetached = false;
     win->GtkUpdateSize();
 }
 }
@@ -105,7 +104,7 @@ static void gtk_menu_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidget *
     // Raise the client area area
     gdk_window_raise( win->m_wxwindow->window );
 
-    win->m_menuBarDetached = TRUE;
+    win->m_menuBarDetached = true;
     win->GtkUpdateSize();
 }
 }
@@ -122,7 +121,7 @@ static void gtk_toolbar_attached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
 {
     if (!win->m_hasVMT) return;
 
-    win->m_toolBarDetached = FALSE;
+    win->m_toolBarDetached = false;
     win->GtkUpdateSize();
 }
 }
@@ -142,7 +141,7 @@ static void gtk_toolbar_detached_callback( GtkWidget *WXUNUSED(widget), GtkWidge
     // Raise the client area area
     gdk_window_raise( win->m_wxwindow->window );
 
-    win->m_toolBarDetached = TRUE;
+    win->m_toolBarDetached = true;
     win->GtkUpdateSize();
 }
 }
@@ -215,8 +214,8 @@ static void wxInsertChildInFrame( wxFrame* parent, wxWindow* child )
 
 void wxFrame::Init()
 {
-    m_menuBarDetached = FALSE;
+    m_menuBarDetached = false;
-    m_toolBarDetached = FALSE;
+    m_toolBarDetached = false;
     m_menuBarHeight = 2;
 }
 
@@ -237,7 +236,7 @@ bool wxFrame::Create( wxWindow *parent,
 
 wxFrame::~wxFrame()
 {
-    m_isBeingDeleted = TRUE;
+    m_isBeingDeleted = true;
     DeleteAllBars();
 }
 
@@ -352,7 +351,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
 
     // avoid recursions
     if (m_resizing) return;
-    m_resizing = TRUE;
+    m_resizing = true;
 
     // this shouldn't happen: wxFrame, wxMDIParentFrame and wxMDIChildFrame have m_wxwindow
     wxASSERT_MSG( (m_wxwindow != NULL), wxT("invalid frame") );
@@ -498,7 +497,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
-    m_sizeSet = TRUE;
+    m_sizeSet = true;
 
     // send size event to frame
     wxSizeEvent event( wxSize(m_width,m_height), GetId() );
@@ -515,7 +514,7 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y),
     }
 #endif // wxUSE_STATUSBAR
 
-    m_resizing = FALSE;
+    m_resizing = false;
 }
 
 void wxFrame::OnInternalIdle()
@@ -641,11 +640,11 @@ wxToolBar* wxFrame::CreateToolBar( long style, wxWindowID id, const wxString& na
 {
     wxASSERT_MSG( (m_widget != NULL), wxT("invalid frame") );
 
-    m_insertInClientArea = FALSE;
+    m_insertInClientArea = false;
 
     m_frameToolBar = wxFrameBase::CreateToolBar( style, id, name );
 
-    m_insertInClientArea = TRUE;
+    m_insertInClientArea = true;
 
     GtkUpdateSize();
 

src/gtk1/renderer.cpp

@@ -42,6 +42,11 @@
     #define WXUNUSED_IN_GTK1(arg)
 #endif
 
+// RR: After a correction to the orientation of the sash
+//     this doesn't seem to be required anymore and it
+//     seems to confuse some themes so USE_ERASE_RECT=0
+#define USE_ERASE_RECT 0
+
 // ----------------------------------------------------------------------------
 // wxRendererGTK: our wxRendererNative implementation
 // ----------------------------------------------------------------------------
@@ -289,7 +294,10 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
     const bool isVert = orient == wxVERTICAL;
 
     GdkRectangle rect;
+#if USE_ERASE_RECT
     GdkRectangle erase_rect;
+#endif
+
     if ( isVert )
     {
         int h = win->GetClientSize().GetHeight();
@@ -299,10 +307,12 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.width = full_size;
         rect.height = h;
 
+#if USE_ERASE_RECT
         erase_rect.x = position;
         erase_rect.y = 0;
         erase_rect.width = full_size;
         erase_rect.height = h;
+#endif
     }
     else // horz
     {
@@ -313,17 +323,15 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
         rect.height = full_size;
         rect.width = w;
 
+#if USE_ERASE_RECT
         erase_rect.y = position;
         erase_rect.x = 0;
         erase_rect.height = full_size;
         erase_rect.width = w;
+#endif
     }
 
-#if 0
+#if USE_ERASE_RECT
-    // RR: After a correction to the orientation of the sash
-    //     this doesn't seem to be required anymore and it
-    //     seems to confuse some themes
-
     // we must erase everything first, otherwise the garbage
     // from the old sash is left when dragging it
     gtk_paint_flat_box

src/gtk1/scrolbar.cpp

@@ -35,7 +35,6 @@ extern bool g_isIdle;
 //-----------------------------------------------------------------------------
 
 extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
 static wxEventType g_currentUpDownEvent = wxEVT_NULL;
 
 static const float sensitivity = 0.02;
@@ -157,7 +156,7 @@ gtk_scrollbar_button_release_callback( GtkRange *WXUNUSED(widget),
         win->GetEventHandler()->ProcessEvent( event );
     }
 
-    win->m_isScrolling = FALSE;
+    win->m_isScrolling = false;
 
     // reset the LINEUP/LINEDOWN flag when the mouse button is released
     g_currentUpDownEvent = wxEVT_NULL;
@@ -180,14 +179,14 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos, const wxSize& size,
            long style, const wxValidator& validator, const wxString& name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
-    m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxScrollBar creation failed") );
-        return FALSE;
+        return false;
     }
 
     m_oldPos = 0.0;
@@ -216,7 +215,7 @@ bool wxScrollBar::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 int wxScrollBar::GetThumbPosition() const

src/gtk1/tbargtk.cpp

@@ -32,8 +32,6 @@
 #include <glib.h>
 #include "wx/gtk/private.h"
 
-extern GdkFont *GtkGetDefaultGuiFont();
-
 // ----------------------------------------------------------------------------
 // globals
 // ----------------------------------------------------------------------------
@@ -271,7 +269,7 @@ wxToolBarToolBase *wxToolBar::CreateTool(wxControl *control)
 void wxToolBar::Init()
 {
     m_toolbar = (GtkToolbar *)NULL;
-    m_blockEvent = FALSE;
+    m_blockEvent = false;
     m_defaultWidth = 32;
     m_defaultHeight = 32;
 }
@@ -287,7 +285,7 @@ bool wxToolBar::Create( wxWindow *parent,
                         long style,
                         const wxString& name )
 {
-    m_needParent = TRUE;
+    m_needParent = true;
     m_insertCallback = (wxInsertChildFunction)wxInsertChildInToolBar;
 
     if ( !PreCreation( parent, pos, size ) ||
@@ -295,7 +293,7 @@ bool wxToolBar::Create( wxWindow *parent,
     {
         wxFAIL_MSG( wxT("wxToolBar creation failed") );
 
-        return FALSE;
+        return false;
     }
 
 #ifdef __WXGTK20__
@@ -344,7 +342,7 @@ bool wxToolBar::Create( wxWindow *parent,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 void wxToolBar::GtkSetStyle()
@@ -383,13 +381,13 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
         {
             wxBitmap bitmap = tool->GetNormalBitmap();
 
-            wxCHECK_MSG( bitmap.Ok(), FALSE,
+            wxCHECK_MSG( bitmap.Ok(), false,
                          wxT("invalid bitmap for wxToolBar icon") );
 
-            wxCHECK_MSG( bitmap.GetBitmap() == NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetBitmap() == NULL, false,
                          wxT("wxToolBar doesn't support GdkBitmap") );
 
-            wxCHECK_MSG( bitmap.GetPixmap() != NULL, FALSE,
+            wxCHECK_MSG( bitmap.GetPixmap() != NULL, false,
                          wxT("wxToolBar::Add needs a wxBitmap") );
 
             GtkWidget *tool_pixmap = (GtkWidget *)NULL;
@@ -452,7 +450,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                         // this is the first button in the radio button group,
                         // it will be toggled automatically by GTK so bring the
                         // internal flag in sync
-                        tool->Toggle(TRUE);
+                        tool->Toggle(true);
                     }
                 }
 
@@ -478,7 +476,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
                 {
                     wxFAIL_MSG( _T("gtk_toolbar_insert_element() failed") );
 
-                    return FALSE;
+                    return false;
                 }
 
                 gtk_signal_connect( GTK_OBJECT(tool->m_item),
@@ -496,7 +494,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
             gtk_toolbar_insert_space( m_toolbar, posGtk );
 
             // skip the rest
-            return TRUE;
+            return true;
 
         case wxTOOL_STYLE_CONTROL:
             gtk_toolbar_insert_widget(
@@ -516,7 +514,7 @@ bool wxToolBar::DoInsertTool(size_t pos, wxToolBarToolBase *toolBase)
     m_height = req.height + 2*m_yMargin;
     InvalidateBestSize();
 
-    return TRUE;
+    return true;
 }
 
 bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
@@ -541,7 +539,7 @@ bool wxToolBar::DoDeleteTool(size_t pos, wxToolBarToolBase *toolBase)
     }
 
     InvalidateBestSize();
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
@@ -567,11 +565,11 @@ void wxToolBar::DoToggleTool( wxToolBarToolBase *toolBase, bool toggle )
     {
         tool->SetPixmap(tool->GetBitmap());
 
-        m_blockEvent = TRUE;
+        m_blockEvent = true;
 
         gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(item), toggle );
 
-        m_blockEvent = FALSE;
+        m_blockEvent = false;
     }
 }
 

src/gtk1/textctrl.cpp

@@ -42,7 +42,6 @@ extern bool g_isIdle;
 // data
 //-----------------------------------------------------------------------------
 
-extern bool       g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
 extern wxWindowGTK *g_delayedFocus;
 

src/gtk1/tglbtn.cpp

@@ -24,7 +24,6 @@ extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 extern bool      g_blockEventsOnDrag;
 extern wxCursor   g_globalCursor;
-extern wxWindowGTK *g_delayedFocus;
 
 extern "C" {
 static void gtk_togglebutton_clicked_callback(GtkWidget *WXUNUSED(widget), wxToggleButton *cb)
@@ -59,16 +58,16 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
-    m_needParent = TRUE;
+    m_needParent = true;
-    m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
-    m_blockEvent = FALSE;
+    m_blockEvent = false;
 
     if (!PreCreation(parent, pos, size) ||
        !CreateBase(parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG(wxT("wxToggleBitmapButton creation failed"));
-        return FALSE;
+        return false;
     }
 
     m_bitmap = label;
@@ -92,7 +91,7 @@ bool wxToggleBitmapButton::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-    return TRUE;
+    return true;
 }
 
 // void SetValue(bool state)
@@ -104,18 +103,18 @@ void wxToggleBitmapButton::SetValue(bool state)
     if (state == GetValue())
         return;
 
-   m_blockEvent = TRUE;
+    m_blockEvent = true;
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleBitmapButton::GetValue() const
 {
-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
 
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
@@ -152,14 +151,14 @@ void wxToggleBitmapButton::OnSetBitmap()
     }
 }
 
-bool wxToggleBitmapButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleBitmapButton::Enable(bool enable /*=true*/)
 {
     if (!wxControl::Enable(enable))
-        return FALSE;
+        return false;
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
-    return TRUE;
+    return true;
 }
 
 void wxToggleBitmapButton::DoApplyWidgetStyle(GtkRcStyle *style)
@@ -232,15 +231,15 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
                             const wxValidator& validator,
                             const wxString &name)
 {
-   m_needParent = TRUE;
+    m_needParent = true;
-   m_acceptsFocus = TRUE;
+    m_acceptsFocus = true;
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 
     if (!PreCreation(parent, pos, size) ||
         !CreateBase(parent, id, pos, size, style, validator, name )) {
         wxFAIL_MSG(wxT("wxToggleButton creation failed"));
-      return FALSE;
+        return false;
     }
 
     wxControl::SetLabel(label);
@@ -256,7 +255,7 @@ bool wxToggleButton::Create(wxWindow *parent, wxWindowID id,
 
     PostCreation(size);
 
-   return TRUE;
+    return true;
 }
 
 // void SetValue(bool state)
@@ -268,18 +267,18 @@ void wxToggleButton::SetValue(bool state)
     if (state == GetValue())
         return;
 
-   m_blockEvent = TRUE;
+    m_blockEvent = true;
 
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_widget), state);
 
-   m_blockEvent = FALSE;
+    m_blockEvent = false;
 }
 
 // bool GetValue() const
 // Get the value of the toggle button.
 bool wxToggleButton::GetValue() const
 {
-   wxCHECK_MSG(m_widget != NULL, FALSE, wxT("invalid toggle button"));
+    wxCHECK_MSG(m_widget != NULL, false, wxT("invalid toggle button"));
 
     return GTK_TOGGLE_BUTTON(m_widget)->active;
 }
@@ -293,14 +292,14 @@ void wxToggleButton::SetLabel(const wxString& label)
     gtk_label_set(GTK_LABEL(BUTTON_CHILD(m_widget)), wxGTK_CONV( GetLabel() ) );
 }
 
-bool wxToggleButton::Enable(bool enable /*=TRUE*/)
+bool wxToggleButton::Enable(bool enable /*=true*/)
 {
     if (!wxControl::Enable(enable))
-        return FALSE;
+        return false;
 
     gtk_widget_set_sensitive(BUTTON_CHILD(m_widget), enable);
 
-    return TRUE;
+    return true;
 }
 
 void wxToggleButton::DoApplyWidgetStyle(GtkRcStyle *style)