From b4efc9b9315fc9387c44dc5e968dc422b12e7920 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 6 Jan 2005 12:41:27 +0000 Subject: [PATCH] Old API clearly deprecated. Source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/radiobox.h | 11 +++---- include/wx/gtk1/radiobox.h | 11 +++---- include/wx/radiobox.h | 6 ++-- include/wx/tbarbase.h | 8 ++--- src/common/radiocmn.cpp | 19 +++++++++++ src/common/tbarbase.cpp | 24 ++++++++++++++ src/gtk/radiobox.cpp | 67 ++++++++++++++++++++++++-------------- src/gtk1/radiobox.cpp | 67 ++++++++++++++++++++++++-------------- 8 files changed, 146 insertions(+), 67 deletions(-) diff --git a/include/wx/gtk/radiobox.h b/include/wx/gtk/radiobox.h index 0791f740c3..ff0fc1dbfa 100644 --- a/include/wx/gtk/radiobox.h +++ b/include/wx/gtk/radiobox.h @@ -97,17 +97,16 @@ public: // for compatibility only, don't use these methods in new code! #if WXWIN_COMPATIBILITY_2_2 - int Number() const { return GetCount(); } - wxString GetLabel(int n) const { return GetString(n); } - void SetLabel( int item, const wxString& label ) - { SetString(item, label); } + wxDEPRECATED( int Number() const ); + wxDEPRECATED( wxString GetLabel(int n) const ); + wxDEPRECATED( void SetLabel( int item, const wxString& label ) ); #endif // WXWIN_COMPATIBILITY_2_2 // we have to override those to avoid virtual function name hiding virtual wxString GetLabel() const { return wxControl::GetLabel(); } virtual void SetLabel( const wxString& label ); - virtual bool Show( bool show = TRUE ); - virtual bool Enable( bool enable = TRUE ); + virtual bool Show( bool show = true ); + virtual bool Enable( bool enable = true ); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); diff --git a/include/wx/gtk1/radiobox.h b/include/wx/gtk1/radiobox.h index 0791f740c3..ff0fc1dbfa 100644 --- a/include/wx/gtk1/radiobox.h +++ b/include/wx/gtk1/radiobox.h @@ -97,17 +97,16 @@ public: // for compatibility only, don't use these methods in new code! #if WXWIN_COMPATIBILITY_2_2 - int Number() const { return GetCount(); } - wxString GetLabel(int n) const { return GetString(n); } - void SetLabel( int item, const wxString& label ) - { SetString(item, label); } + wxDEPRECATED( int Number() const ); + wxDEPRECATED( wxString GetLabel(int n) const ); + wxDEPRECATED( void SetLabel( int item, const wxString& label ) ); #endif // WXWIN_COMPATIBILITY_2_2 // we have to override those to avoid virtual function name hiding virtual wxString GetLabel() const { return wxControl::GetLabel(); } virtual void SetLabel( const wxString& label ); - virtual bool Show( bool show = TRUE ); - virtual bool Enable( bool enable = TRUE ); + virtual bool Show( bool show = true ); + virtual bool Enable( bool enable = true ); static wxVisualAttributes GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h index 3986c8a853..51721888f2 100644 --- a/include/wx/radiobox.h +++ b/include/wx/radiobox.h @@ -97,9 +97,9 @@ public: // for compatibility only, don't use these methods in new code! #if WXWIN_COMPATIBILITY_2_2 - int Number() const { return GetCount(); } - wxString GetLabel(int n) const { return GetString(n); } - void SetLabel(int n, const wxString& label) { SetString(n, label); } + wxDEPRECATED( int Number() const ); + wxDEPRECATED( wxString GetLabel(int n) const ); + wxDEPRECATED( void SetLabel(int n, const wxString& label) ); #endif // WXWIN_COMPATIBILITY_2_2 }; diff --git a/include/wx/tbarbase.h b/include/wx/tbarbase.h index 604785aeef..24b2c66dbb 100644 --- a/include/wx/tbarbase.h +++ b/include/wx/tbarbase.h @@ -200,11 +200,11 @@ public: // compatibility only, don't use #if WXWIN_COMPATIBILITY_2_2 - const wxBitmap& GetBitmap1() const { return GetNormalBitmap(); } - const wxBitmap& GetBitmap2() const { return GetDisabledBitmap(); } + wxDEPRECATED( const wxBitmap& GetBitmap1() const ); + wxDEPRECATED( const wxBitmap& GetBitmap2() const ); - void SetBitmap1(const wxBitmap& bmp) { SetNormalBitmap(bmp); } - void SetBitmap2(const wxBitmap& bmp) { SetDisabledBitmap(bmp); } + wxDEPRECATED( void SetBitmap1(const wxBitmap& bmp) ); + wxDEPRECATED( void SetBitmap2(const wxBitmap& bmp) ); #endif // WXWIN_COMPATIBILITY_2_2 protected: diff --git a/src/common/radiocmn.cpp b/src/common/radiocmn.cpp index c936cc3593..bf88463af5 100644 --- a/src/common/radiocmn.cpp +++ b/src/common/radiocmn.cpp @@ -148,5 +148,24 @@ void wxRadioBoxBase::SetNumberOfRowsOrCols(int WXUNUSED(n)) #endif // WXWIN_COMPATIBILITY_2_4 +#if WXWIN_COMPATIBILITY_2_2 + +int wxRadioBoxBase::Number() const +{ + return GetCount(); +} + +wxString wxRadioBoxBase::GetLabel(int n) const +{ + return GetString(n); +} + +void wxRadioBoxBase::SetLabel(int n, const wxString& label) +{ + SetString(n, label); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + #endif // wxUSE_RADIOBOX diff --git a/src/common/tbarbase.cpp b/src/common/tbarbase.cpp index 2d250e20d5..e9b2c110ec 100644 --- a/src/common/tbarbase.cpp +++ b/src/common/tbarbase.cpp @@ -114,6 +114,30 @@ bool wxToolBarToolBase::SetLongHelp(const wxString& help) return true; } +#if WXWIN_COMPATIBILITY_2_2 + +const wxBitmap& wxToolBarToolBase::GetBitmap1() const +{ + return GetNormalBitmap(); +} + +const wxBitmap& wxToolBarToolBase::GetBitmap2() const +{ + return GetDisabledBitmap(); +} + +void wxToolBarToolBase::SetBitmap1(const wxBitmap& bmp) +{ + SetNormalBitmap(bmp); +} + +void wxToolBarToolBase::SetBitmap2(const wxBitmap& bmp) +{ + SetDisabledBitmap(bmp); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + // ---------------------------------------------------------------------------- // wxToolBarBase adding/deleting items // ---------------------------------------------------------------------------- diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index 74ce85b3f6..04050c30dd 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -123,7 +123,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } else if ( !win->m_hasFocus ) { - win->m_hasFocus = TRUE; + win->m_hasFocus = true; wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -147,8 +147,8 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, // we might have lost the focus, but may be not - it may have just gone to // another button in the same radiobox, so we'll check for it in the next - // idle iteration (leave m_hasFocus == TRUE for now) - win->m_lostFocus = TRUE; + // idle iteration (leave m_hasFocus == true for now) + win->m_lostFocus = true; return FALSE; } @@ -161,11 +161,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; m_hasFocus = - m_lostFocus = FALSE; + m_lostFocus = false; } bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, @@ -191,7 +191,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxRadioBox creation failed") ); - return FALSE; + return false; } m_widget = gtk_frame_new( wxGTK_CONV( title ) ); @@ -254,7 +254,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if ( wasShown ) Show(); - return TRUE; + return true; } wxRadioBox::~wxRadioBox() @@ -314,9 +314,9 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const num_of_cols = num_per_major; num_of_rows = m_majorDim; } - + int lineheight = GetCharHeight()+2; - + if ( HasFlag(wxRA_SPECIFY_COLS) || (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) { @@ -336,7 +336,7 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const req.height = 2; (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) (button, &req ); - + if (req.width > max_len) max_len = req.width; if ( !justCalc ) @@ -409,12 +409,12 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const bool wxRadioBox::Show( bool show ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); if (!wxControl::Show(show)) { // nothing to do - return FALSE; + return false; } if ( HasFlag(wxNO_BORDER) ) @@ -430,7 +430,7 @@ bool wxRadioBox::Show( bool show ) node = node->GetNext(); } - return TRUE; + return true; } int wxRadioBox::FindString( const wxString &find ) const @@ -559,7 +559,7 @@ void wxRadioBox::SetString( int item, const wxString& label ) bool wxRadioBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) @@ -572,7 +572,7 @@ bool wxRadioBox::Enable( bool enable ) node = node->GetNext(); } - return TRUE; + return true; } void wxRadioBox::Enable( int item, bool enable ) @@ -634,13 +634,13 @@ wxString wxRadioBox::GetStringSelection() const bool wxRadioBox::SetStringSelection( const wxString &s ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); int res = FindString( s ); - if (res == -1) return FALSE; + if (res == -1) return false; SetSelection( res ); - return TRUE; + return true; } int wxRadioBox::GetCount() const @@ -707,27 +707,27 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return TRUE; + if (window == m_widget->window) return true; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return TRUE; + if (window == button->window) return true; node = node->GetNext(); } - return FALSE; + return false; } void wxRadioBox::OnInternalIdle() { if ( m_lostFocus ) { - m_hasFocus = FALSE; - m_lostFocus = FALSE; + m_hasFocus = false; + m_lostFocus = false; wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); @@ -759,5 +759,24 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attr; } +#if WXWIN_COMPATIBILITY_2_2 + +int wxRadioBox::Number() const +{ + return GetCount(); +} + +wxString wxRadioBox::GetLabel(int n) const +{ + return GetString(n); +} + +void wxRadioBox::SetLabel( int item, const wxString& label ) +{ + SetString(item, label); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + #endif // wxUSE_RADIOBOX diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp index 74ce85b3f6..04050c30dd 100644 --- a/src/gtk1/radiobox.cpp +++ b/src/gtk1/radiobox.cpp @@ -123,7 +123,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } else if ( !win->m_hasFocus ) { - win->m_hasFocus = TRUE; + win->m_hasFocus = true; wxFocusEvent event( wxEVT_SET_FOCUS, win->GetId() ); event.SetEventObject( win ); @@ -147,8 +147,8 @@ static gint gtk_radiobutton_focus_out( GtkWidget *widget, // we might have lost the focus, but may be not - it may have just gone to // another button in the same radiobox, so we'll check for it in the next - // idle iteration (leave m_hasFocus == TRUE for now) - win->m_lostFocus = TRUE; + // idle iteration (leave m_hasFocus == true for now) + win->m_lostFocus = true; return FALSE; } @@ -161,11 +161,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl) void wxRadioBox::Init() { - m_needParent = TRUE; - m_acceptsFocus = TRUE; + m_needParent = true; + m_acceptsFocus = true; m_hasFocus = - m_lostFocus = FALSE; + m_lostFocus = false; } bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, @@ -191,7 +191,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, !CreateBase( parent, id, pos, size, style, validator, name )) { wxFAIL_MSG( wxT("wxRadioBox creation failed") ); - return FALSE; + return false; } m_widget = gtk_frame_new( wxGTK_CONV( title ) ); @@ -254,7 +254,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title, if ( wasShown ) Show(); - return TRUE; + return true; } wxRadioBox::~wxRadioBox() @@ -314,9 +314,9 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const num_of_cols = num_per_major; num_of_rows = m_majorDim; } - + int lineheight = GetCharHeight()+2; - + if ( HasFlag(wxRA_SPECIFY_COLS) || (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) ) { @@ -336,7 +336,7 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const req.height = 2; (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->size_request ) (button, &req ); - + if (req.width > max_len) max_len = req.width; if ( !justCalc ) @@ -409,12 +409,12 @@ wxSize wxRadioBox::LayoutItems(bool justCalc) const bool wxRadioBox::Show( bool show ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); if (!wxControl::Show(show)) { // nothing to do - return FALSE; + return false; } if ( HasFlag(wxNO_BORDER) ) @@ -430,7 +430,7 @@ bool wxRadioBox::Show( bool show ) node = node->GetNext(); } - return TRUE; + return true; } int wxRadioBox::FindString( const wxString &find ) const @@ -559,7 +559,7 @@ void wxRadioBox::SetString( int item, const wxString& label ) bool wxRadioBox::Enable( bool enable ) { if ( !wxControl::Enable( enable ) ) - return FALSE; + return false; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) @@ -572,7 +572,7 @@ bool wxRadioBox::Enable( bool enable ) node = node->GetNext(); } - return TRUE; + return true; } void wxRadioBox::Enable( int item, bool enable ) @@ -634,13 +634,13 @@ wxString wxRadioBox::GetStringSelection() const bool wxRadioBox::SetStringSelection( const wxString &s ) { - wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid radiobox") ); + wxCHECK_MSG( m_widget != NULL, false, wxT("invalid radiobox") ); int res = FindString( s ); - if (res == -1) return FALSE; + if (res == -1) return false; SetSelection( res ); - return TRUE; + return true; } int wxRadioBox::GetCount() const @@ -707,27 +707,27 @@ void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window ) { - if (window == m_widget->window) return TRUE; + if (window == m_widget->window) return true; wxList::compatibility_iterator node = m_boxes.GetFirst(); while (node) { GtkWidget *button = GTK_WIDGET( node->GetData() ); - if (window == button->window) return TRUE; + if (window == button->window) return true; node = node->GetNext(); } - return FALSE; + return false; } void wxRadioBox::OnInternalIdle() { if ( m_lostFocus ) { - m_hasFocus = FALSE; - m_lostFocus = FALSE; + m_hasFocus = false; + m_lostFocus = false; wxFocusEvent event( wxEVT_KILL_FOCUS, GetId() ); event.SetEventObject( this ); @@ -759,5 +759,24 @@ wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) return attr; } +#if WXWIN_COMPATIBILITY_2_2 + +int wxRadioBox::Number() const +{ + return GetCount(); +} + +wxString wxRadioBox::GetLabel(int n) const +{ + return GetString(n); +} + +void wxRadioBox::SetLabel( int item, const wxString& label ) +{ + SetString(item, label); +} + +#endif // WXWIN_COMPATIBILITY_2_2 + #endif // wxUSE_RADIOBOX -- 2.47.2