From ff654490b7cb185631a1dc4621094d88643ccf41 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 5 Nov 2007 22:31:24 +0000 Subject: [PATCH] removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/clrpicker.h | 9 +- include/wx/collpane.h | 4 +- include/wx/dirdlg.h | 2 +- include/wx/filectrl.h | 2 +- include/wx/filedlg.h | 2 +- include/wx/fontpicker.h | 7 +- include/wx/generic/clrpickerg.h | 7 - include/wx/generic/collpaneg.h | 3 - include/wx/generic/fontpickerg.h | 3 - include/wx/gtk/clrpicker.h | 15 +- include/wx/gtk/collpane.h | 18 +- include/wx/gtk/combobox.h | 7 +- include/wx/gtk/dirdlg.h | 10 +- include/wx/gtk/fontpicker.h | 15 +- src/generic/animateg.cpp | 4 +- src/generic/buttonbar.cpp | 2 +- src/generic/collpaneg.cpp | 4 +- src/generic/colrdlgg.cpp | 4 +- src/generic/dirctrlg.cpp | 6 +- src/generic/dragimgg.cpp | 3 +- src/gtk/artgtk.cpp | 5 +- src/gtk/clrpicker.cpp | 46 +- src/gtk/collpane.cpp | 79 ++-- src/gtk/colordlg.cpp | 4 +- src/gtk/combobox.cpp | 715 +++++-------------------------- src/gtk/cursor.cpp | 83 ++-- src/gtk/dataobj.cpp | 6 +- src/gtk/dcclient.cpp | 15 +- src/gtk/dirdlg.cpp | 157 +++---- src/gtk/filectrl.cpp | 8 +- src/gtk/filedlg.cpp | 2 +- src/gtk/fontpicker.cpp | 70 ++- src/gtk/glcanvas.cpp | 41 +- src/gtk/menu.cpp | 4 - src/gtk/msgdlg.cpp | 4 +- src/gtk/settings.cpp | 97 ++--- src/gtk/textctrl.cpp | 55 +-- src/gtk/toplevel.cpp | 108 ++--- src/gtk/window.cpp | 4 - src/unix/fontenum.cpp | 49 +-- src/unix/fontutil.cpp | 6 +- 41 files changed, 467 insertions(+), 1218 deletions(-) diff --git a/include/wx/clrpicker.h b/include/wx/clrpicker.h index e2d52184e6..151693bc07 100644 --- a/include/wx/clrpicker.h +++ b/include/wx/clrpicker.h @@ -25,6 +25,13 @@ class WXDLLIMPEXP_FWD_CORE wxColourPickerEvent; extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerWidgetNameStr[]; extern WXDLLEXPORT_DATA(const wxChar) wxColourPickerCtrlNameStr[]; +// show the colour in HTML form (#AABBCC) as colour button label +#define wxCLRBTN_SHOW_LABEL 100 + +// the default style +#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL) + + // ---------------------------------------------------------------------------- // wxColourPickerWidgetBase: a generic abstract interface which must be @@ -70,7 +77,7 @@ protected: // same prototype for their contructor (and also explains why we use // define instead of a typedef) // since GTK > 2.4, there is GtkColorButton -#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/clrpicker.h" #define wxColourPickerWidget wxColourButton #else diff --git a/include/wx/collpane.h b/include/wx/collpane.h index 8ff545d3bc..2d26191c24 100644 --- a/include/wx/collpane.h +++ b/include/wx/collpane.h @@ -19,6 +19,8 @@ #include "wx/control.h" +// class name +extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[]; // ---------------------------------------------------------------------------- // wxCollapsiblePaneBase: interface for wxCollapsiblePane @@ -90,7 +92,7 @@ typedef void (wxEvtHandler::*wxCollapsiblePaneEventFunction)(wxCollapsiblePaneEv wx__DECLARE_EVT1(wxEVT_COMMAND_COLLPANE_CHANGED, id, wxCollapsiblePaneEventHandler(fn)) -#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/collpane.h" #else #include "wx/generic/collpaneg.h" diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h index a5b0cba021..04edeebdc8 100644 --- a/include/wx/dirdlg.h +++ b/include/wx/dirdlg.h @@ -106,7 +106,7 @@ protected: #define wxDirDialog wxGenericDirDialog #elif defined(__WXMSW__) #include "wx/msw/dirdlg.h" // Native MSW -#elif defined(__WXGTK24__) +#elif defined(__WXGTK20__) #include "wx/gtk/dirdlg.h" // Native GTK for gtk2.4 #elif defined(__WXGTK__) #include "wx/generic/dirdlgg.h" diff --git a/include/wx/filectrl.h b/include/wx/filectrl.h index 8e9f6f49a5..a44a1305e2 100644 --- a/include/wx/filectrl.h +++ b/include/wx/filectrl.h @@ -73,7 +73,7 @@ void GenerateFolderChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd ); void GenerateSelectionChangedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd ); void GenerateFileActivatedEvent( wxFileCtrlBase *fileCtrl, wxWindow *wnd, const wxString filename = wxEmptyString ); -#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #define wxFileCtrl wxGtkFileCtrl #include "wx/gtk/filectrl.h" #else diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h index 394a93c87d..86415900cf 100644 --- a/include/wx/filedlg.h +++ b/include/wx/filedlg.h @@ -192,7 +192,7 @@ wxSaveFileSelector(const wxString& what, #include "wx/msw/filedlg.h" #elif defined(__WXMOTIF__) #include "wx/motif/filedlg.h" -#elif defined(__WXGTK24__) +#elif defined(__WXGTK20__) #include "wx/gtk/filedlg.h" // GTK+ > 2.4 has native version #elif defined(__WXGTK__) #include "wx/gtk1/filedlg.h" diff --git a/include/wx/fontpicker.h b/include/wx/fontpicker.h index 2f12112fc3..14da2fffc2 100644 --- a/include/wx/fontpicker.h +++ b/include/wx/fontpicker.h @@ -66,8 +66,11 @@ protected: // uses the currently selected font to draw the label of the button #define wxFNTP_USEFONT_FOR_LABEL 0x0010 -// since GTK > 2.4, there is GtkFontButton -#if defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#define wxFONTBTN_DEFAULT_STYLE \ + (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL) + +// native version currently only exists in wxGTK2 +#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__) #include "wx/gtk/fontpicker.h" #define wxFontPickerWidget wxFontButton #else diff --git a/include/wx/generic/clrpickerg.h b/include/wx/generic/clrpickerg.h index 17dc568551..758e51619f 100644 --- a/include/wx/generic/clrpickerg.h +++ b/include/wx/generic/clrpickerg.h @@ -19,13 +19,6 @@ // wxGenericColourButton: a button which brings up a wxColourDialog //----------------------------------------------------------------------------- -// show the colour in HTML form (#AABBCC) as colour button label -#define wxCLRBTN_SHOW_LABEL 100 - -// the default style -#define wxCLRBTN_DEFAULT_STYLE (wxCLRBTN_SHOW_LABEL) - - class WXDLLIMPEXP_CORE wxGenericColourButton : public wxButton, public wxColourPickerWidgetBase { diff --git a/include/wx/generic/collpaneg.h b/include/wx/generic/collpaneg.h index 9249aec213..a12b6f1fc4 100644 --- a/include/wx/generic/collpaneg.h +++ b/include/wx/generic/collpaneg.h @@ -16,9 +16,6 @@ class WXDLLIMPEXP_FWD_CORE wxButton; class WXDLLIMPEXP_FWD_CORE wxStaticLine; -// class name -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxCollapsiblePaneNameStr[]; - // ---------------------------------------------------------------------------- // wxGenericCollapsiblePane // ---------------------------------------------------------------------------- diff --git a/include/wx/generic/fontpickerg.h b/include/wx/generic/fontpickerg.h index a3c27f4321..ce4f6adb3b 100644 --- a/include/wx/generic/fontpickerg.h +++ b/include/wx/generic/fontpickerg.h @@ -19,9 +19,6 @@ // wxGenericFontButton: a button which brings up a wxColourDialog //----------------------------------------------------------------------------- -#define wxFONTBTN_DEFAULT_STYLE \ - (wxFNTP_FONTDESC_AS_LABEL | wxFNTP_USEFONT_FOR_LABEL) - class WXDLLIMPEXP_CORE wxGenericFontButton : public wxButton, public wxFontPickerWidgetBase { diff --git a/include/wx/gtk/clrpicker.h b/include/wx/gtk/clrpicker.h index 3998ca027d..1ddbfe3b18 100644 --- a/include/wx/gtk/clrpicker.h +++ b/include/wx/gtk/clrpicker.h @@ -12,16 +12,12 @@ #ifndef _WX_GTK_CLRPICKER_H_ #define _WX_GTK_CLRPICKER_H_ -// since GtkColorButton is available only for GTK+ >= 2.4, -// we need to use generic version if we detect (at runtime) -// that GTK+ < 2.4 -#include "wx/generic/clrpickerg.h" - //----------------------------------------------------------------------------- // wxColourButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxColourButton : public wxGenericColourButton +class WXDLLIMPEXP_CORE wxColourButton : public wxButton, + public wxColourPickerWidgetBase { public: wxColourButton() : m_topParent(NULL) {} @@ -38,11 +34,6 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual ~wxColourButton(); - - -public: // overrides - bool Create(wxWindow *parent, wxWindowID id, const wxColour& initial = *wxBLACK, @@ -52,6 +43,8 @@ public: // overrides const wxValidator& validator = wxDefaultValidator, const wxString& name = wxColourPickerWidgetNameStr); + virtual ~wxColourButton(); + protected: void UpdateColour(); diff --git a/include/wx/gtk/collpane.h b/include/wx/gtk/collpane.h index 563ad8f3df..ecc8f9bd3a 100644 --- a/include/wx/gtk/collpane.h +++ b/include/wx/gtk/collpane.h @@ -12,13 +12,11 @@ #ifndef _WX_COLLAPSABLE_PANEL_H_GTK_ #define _WX_COLLAPSABLE_PANEL_H_GTK_ -#include "wx/generic/collpaneg.h" - // ---------------------------------------------------------------------------- // wxCollapsiblePane // ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxGenericCollapsiblePane +class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxCollapsiblePaneBase { public: wxCollapsiblePane() { Init(); } @@ -51,9 +49,12 @@ public: const wxValidator& val = wxDefaultValidator, const wxString& name = wxCollapsiblePaneNameStr); - void Collapse(bool collapse = true); - bool IsCollapsed() const; - void SetLabel(const wxString &str); + virtual void Collapse(bool collapse = true); + virtual bool IsCollapsed() const; + virtual void SetLabel(const wxString& str); + + virtual wxWindow *GetPane() const { return m_pPane; } + virtual wxString GetLabel() const { return m_strLabel; } protected: virtual wxSize DoGetBestSize() const; @@ -62,6 +63,11 @@ public: // used by GTK callbacks bool m_bIgnoreNextChange; wxSize m_szCollapsed; + wxWindow *m_pPane; + + // the button label without ">>" or "<<" + wxString m_strLabel; + private: void OnSize(wxSizeEvent&); diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h index 9cb4f9f185..d2df032aae 100644 --- a/include/wx/gtk/combobox.h +++ b/include/wx/gtk/combobox.h @@ -11,6 +11,8 @@ #ifndef _WX_GTK_COMBOBOX_H_ #define _WX_GTK_COMBOBOX_H_ +typedef struct _GtkEntry GtkEntry; + //----------------------------------------------------------------------------- // wxComboBox //----------------------------------------------------------------------------- @@ -94,7 +96,6 @@ public: virtual void SetFocus(); - void OnSize( wxSizeEvent &event ); void OnChar( wxKeyEvent &event ); // Standard event handling @@ -131,7 +132,6 @@ public: protected: // From wxWindowGTK: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; // From wxItemContainer: @@ -150,6 +150,9 @@ protected: // override this and return true. virtual bool UseGTKStyleBase() const { return true; } + // return the GtkEntry part of the combobox + GtkEntry *GetEntry() const; + private: // From wxTextEntry: virtual const wxWindow *GetEditableWindow() const { return this; } diff --git a/include/wx/gtk/dirdlg.h b/include/wx/gtk/dirdlg.h index 35d6085c21..74a105dcd7 100644 --- a/include/wx/gtk/dirdlg.h +++ b/include/wx/gtk/dirdlg.h @@ -10,13 +10,11 @@ #ifndef __GTKDIRDLGH__ #define __GTKDIRDLGH__ -#include "wx/generic/dirdlgg.h" - //------------------------------------------------------------------------- // wxDirDialog //------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxDirDialog : public wxGenericDirDialog +class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase { public: wxDirDialog() { } @@ -37,9 +35,6 @@ public: // overrides from wxGenericDirDialog wxString GetPath() const; void SetPath(const wxString& path); - virtual int ShowModal(); - virtual bool Show( bool show = true ); - protected: // override this from wxTLW since the native @@ -50,9 +45,10 @@ protected: private: + void OnFakeOk( wxCommandEvent &event ); + DECLARE_DYNAMIC_CLASS(wxDirDialog) DECLARE_EVENT_TABLE() - void OnFakeOk( wxCommandEvent &event ); }; #endif // __GTKDIRDLGH__ diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h index cef2cd1665..2bb9c8e103 100644 --- a/include/wx/gtk/fontpicker.h +++ b/include/wx/gtk/fontpicker.h @@ -12,16 +12,12 @@ #ifndef _WX_GTK_FONTPICKER_H_ #define _WX_GTK_FONTPICKER_H_ -// since GtkFontButton is available only for GTK+ >= 2.4, -// we need to use generic version if we detect (at runtime) -// that GTK+ < 2.4 -#include "wx/generic/fontpickerg.h" - //----------------------------------------------------------------------------- // wxFontButton //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxFontButton : public wxGenericFontButton +class WXDLLIMPEXP_CORE wxFontButton : public wxButton, + public wxFontPickerWidgetBase { public: wxFontButton() {} @@ -37,11 +33,6 @@ public: Create(parent, id, initial, pos, size, style, validator, name); } - virtual ~wxFontButton(); - - -public: // overrides - bool Create(wxWindow *parent, wxWindowID id, const wxFont& initial = wxNullFont, @@ -51,6 +42,8 @@ public: // overrides const wxValidator& validator = wxDefaultValidator, const wxString& name = wxFontPickerWidgetNameStr); + virtual ~wxFontButton(); + protected: void UpdateFont(); diff --git a/src/generic/animateg.cpp b/src/generic/animateg.cpp index dc7062fc07..17605f1af8 100644 --- a/src/generic/animateg.cpp +++ b/src/generic/animateg.cpp @@ -15,7 +15,7 @@ #pragma hdrstop #endif //__BORLANDC__ -#if wxUSE_ANIMATIONCTRL && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) +#if wxUSE_ANIMATIONCTRL #include "wx/animate.h" @@ -687,5 +687,5 @@ void wxAnimationCtrl::OnSize(wxSizeEvent &WXUNUSED(event)) } } -#endif // wxUSE_ANIMATIONCTRL +#endif // wxUSE_ANIMATIONCTRL diff --git a/src/generic/buttonbar.cpp b/src/generic/buttonbar.cpp index 512352bf79..c05ef6385b 100644 --- a/src/generic/buttonbar.cpp +++ b/src/generic/buttonbar.cpp @@ -493,7 +493,7 @@ void wxButtonToolBar::OnCommand(wxCommandEvent& event) } // paints a border -void wxButtonToolBar::OnPaint(wxPaintEvent& event) +void wxButtonToolBar::OnPaint(wxPaintEvent& WXUNUSED(event)) { wxPaintDC dc(this); diff --git a/src/generic/collpaneg.cpp b/src/generic/collpaneg.cpp index ae5f0cde3c..40dd98609a 100644 --- a/src/generic/collpaneg.cpp +++ b/src/generic/collpaneg.cpp @@ -88,7 +88,7 @@ bool wxGenericCollapsiblePane::Create(wxWindow *parent, // FIXME: at least under wxCE and wxGTK1 the background is black if we don't do // this, no idea why... -#if defined(__WXWINCE__) || (defined(__WXGTK__) && !defined(__WXGTK20__)) +#if defined(__WXWINCE__) || defined(__WXGTK__) SetBackgroundColour(parent->GetBackgroundColour()); #endif @@ -259,8 +259,6 @@ int wxGenericCollapsiblePane::GetBorder() const { #if defined( __WXMAC__ ) return 6; -#elif defined(__WXGTK20__) - return 3; #elif defined(__WXMSW__) wxASSERT(m_pButton); return m_pButton->ConvertDialogToPixels(wxSize(2, 0)).x; diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 0f4bfd6bab..a8dec5b490 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_COLOURDLG && (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__)) +#if wxUSE_COLOURDLG #ifndef WX_PRECOMP #include "wx/utils.h" @@ -581,4 +581,4 @@ void wxGenericColourDialog::OnBlueSlider(wxCommandEvent& WXUNUSED(event)) #endif // wxUSE_SLIDER -#endif // wxUSE_COLOURDLG && !defined(__WXGTK20__) +#endif // wxUSE_COLOURDLG diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 8e0994cf03..c4bd8118b1 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -1330,7 +1330,7 @@ void wxDirFilterListCtrl::FillFilterList(const wxString& filter, int defaultFilt // wxFileIconsTable icons // ---------------------------------------------------------------------------- -#ifndef __WXGTK24__ +#ifndef __WXGTK20__ /* Computer (c) Julian Smart */ static const char * file_icons_tbl_computer_xpm[] = { /* columns rows colors chars-per-pixel */ @@ -1395,7 +1395,7 @@ static const char * file_icons_tbl_computer_xpm[] = { " dfffffffffffffd", " " }; -#endif // GTK+ < 2.4 +#endif // !GTK+ 2 // ---------------------------------------------------------------------------- // wxFileIconsTable & friends @@ -1464,7 +1464,7 @@ void wxFileIconsTable::Create() wxART_CMN_DIALOG, wxSize(16, 16))); // computer -#ifdef __WXGTK24__ +#ifdef __WXGTK20__ // GTK24 uses this icon in the file open dialog m_smallImageList->Add(wxArtProvider::GetBitmap(wxART_HARDDISK, wxART_CMN_DIALOG, diff --git a/src/generic/dragimgg.cpp b/src/generic/dragimgg.cpp index 36bd745ccc..56ee35e91d 100644 --- a/src/generic/dragimgg.cpp +++ b/src/generic/dragimgg.cpp @@ -451,7 +451,8 @@ bool wxGenericDragImage::Hide() } // More efficient: erase and redraw simultaneously if possible -bool wxGenericDragImage::RedrawImage(const wxPoint& oldPos, const wxPoint& newPos, +bool wxGenericDragImage::RedrawImage(const wxPoint& WXUNUSED(oldPos), + const wxPoint& newPos, bool eraseOld, bool drawNew) { if (!m_windowDC) diff --git a/src/gtk/artgtk.cpp b/src/gtk/artgtk.cpp index a888e389bf..6153868e5c 100644 --- a/src/gtk/artgtk.cpp +++ b/src/gtk/artgtk.cpp @@ -257,11 +257,8 @@ wxBitmap wxGTK2ArtProvider::CreateBitmap(const wxArtID& id, stockid = id.ToAscii(); GdkPixbuf *pixbuf = CreateStockIcon(stockid, stocksize); - - if (!pixbuf && !gtk_check_version(2,4,0)) - { + if (!pixbuf) pixbuf = CreateThemeIcon(stockid, stocksize, size); - } if (pixbuf && size != wxDefaultSize && (size.x != gdk_pixbuf_get_width(pixbuf) || diff --git a/src/gtk/clrpicker.cpp b/src/gtk/clrpicker.cpp index 9184ed7025..57272a0e88 100644 --- a/src/gtk/clrpicker.cpp +++ b/src/gtk/clrpicker.cpp @@ -17,7 +17,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) +#if wxUSE_COLOURPICKERCTRL #include "wx/clrpicker.h" @@ -51,7 +51,7 @@ static void gtk_clrbutton_setcolor_callback(GtkColorButton *widget, // wxColourButton //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxColourButton, wxGenericColourButton) +IMPLEMENT_DYNAMIC_CLASS(wxColourButton, wxButton) bool wxColourButton::Create( wxWindow *parent, wxWindowID id, const wxColour &col, @@ -59,32 +59,27 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id, long style, const wxValidator& validator, const wxString &name ) { - if (!gtk_check_version(2,4,0)) + if (!PreCreation( parent, pos, size ) || + !wxControl::CreateBase(parent, id, pos, size, style, validator, name)) { - if (!PreCreation( parent, pos, size ) || - !wxControl::CreateBase(parent, id, pos, size, style, validator, name)) - { - wxFAIL_MSG( wxT("wxColourButton creation failed") ); - return false; - } + wxFAIL_MSG( wxT("wxColourButton creation failed") ); + return false; + } - m_colour = col; - m_widget = gtk_color_button_new_with_color( m_colour.GetColor() ); - gtk_widget_show(m_widget); + m_colour = col; + m_widget = gtk_color_button_new_with_color( m_colour.GetColor() ); + gtk_widget_show(m_widget); - // GtkColourButton signals - g_signal_connect(m_widget, "color-set", - G_CALLBACK(gtk_clrbutton_setcolor_callback), this); + // GtkColourButton signals + g_signal_connect(m_widget, "color-set", + G_CALLBACK(gtk_clrbutton_setcolor_callback), this); - m_parent->DoAddChild( this ); + m_parent->DoAddChild( this ); + + PostCreation(size); + SetInitialSize(size); - PostCreation(size); - SetInitialSize(size); - } - else - return wxGenericColourButton::Create(parent, id, col, pos, size, - style, validator, name); return true; } @@ -94,10 +89,7 @@ wxColourButton::~wxColourButton() void wxColourButton::UpdateColour() { - if (!gtk_check_version(2,4,0)) - gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor()); - else - wxGenericColourButton::UpdateColour(); + gtk_color_button_set_color(GTK_COLOR_BUTTON(m_widget), m_colour.GetColor()); } -#endif // wxUSE_COLOURPICKERCTRL && defined(__WXGTK24__) +#endif // wxUSE_COLOURPICKERCTRL diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index 1239855006..2702156f34 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -17,7 +17,7 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#if wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#if wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) #include "wx/collpane.h" #include "wx/toplevel.h" @@ -26,6 +26,15 @@ #include "wx/gtk/private.h" +// the lines below duplicate the same definitions in collpaneg.cpp, if we have +// another implementation of this class we should extract them to a common file + +const wxChar wxCollapsiblePaneNameStr[] = wxT("collapsiblePane"); + +DEFINE_EVENT_TYPE(wxEVT_COMMAND_COLLPANE_CHANGED) + +IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneEvent, wxCommandEvent) + // ============================================================================ // implementation // ============================================================================ @@ -153,9 +162,9 @@ gtk_collapsiblepane_insert_callback(wxWindowGTK* parent, wxWindowGTK* child) // wxCollapsiblePane //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxGenericCollapsiblePane) +IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePane, wxControl) -BEGIN_EVENT_TABLE(wxCollapsiblePane, wxGenericCollapsiblePane) +BEGIN_EVENT_TABLE(wxCollapsiblePane, wxCollapsiblePaneBase) EVT_SIZE(wxCollapsiblePane::OnSize) END_EVENT_TABLE() @@ -168,10 +177,6 @@ bool wxCollapsiblePane::Create(wxWindow *parent, const wxValidator& val, const wxString& name) { - if (gtk_check_version(2,4,0)) - return wxGenericCollapsiblePane::Create(parent, id, label, - pos, size, style, val, name); - m_bIgnoreNextChange = false; if ( !PreCreation( parent, pos, size ) || @@ -211,60 +216,42 @@ bool wxCollapsiblePane::Create(wxWindow *parent, wxSize wxCollapsiblePane::DoGetBestSize() const { - if (!gtk_check_version(2,4,0)) - { - wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); + wxASSERT_MSG( m_widget, wxT("DoGetBestSize called before creation") ); - // notice that we do not cache our best size here as it changes - // all times the user expands/hide our pane - return wxSize(req.width, req.height); - } + GtkRequisition req; + req.width = 2; + req.height = 2; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); - return wxGenericCollapsiblePane::DoGetBestSize(); + // notice that we do not cache our best size here as it changes + // all times the user expands/hide our pane + return wxSize(req.width, req.height); } void wxCollapsiblePane::Collapse(bool collapse) { - if (!gtk_check_version(2,4,0)) - { - // optimization - if (IsCollapsed() == collapse) - return; + // optimization + if (IsCollapsed() == collapse) + return; - // do not send event in next signal handler call - m_bIgnoreNextChange = true; - gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse); - } - else - wxGenericCollapsiblePane::Collapse(collapse); + // do not send event in next signal handler call + m_bIgnoreNextChange = true; + gtk_expander_set_expanded(GTK_EXPANDER(m_widget), !collapse); } bool wxCollapsiblePane::IsCollapsed() const { - if (!gtk_check_version(2,4,0)) - return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget)); - - return wxGenericCollapsiblePane::IsCollapsed(); + return !gtk_expander_get_expanded(GTK_EXPANDER(m_widget)); } void wxCollapsiblePane::SetLabel(const wxString &str) { - if (!gtk_check_version(2,4,0)) - { - gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str)); + gtk_expander_set_label(GTK_EXPANDER(m_widget), wxGTK_CONV(str)); - // FIXME: we need to update our collapsed width in some way but using GetBestSize() - // we may get the size of the control with the pane size summed up if we are expanded! - //m_szCollapsed.x = GetBestSize().x; - } - else - wxGenericCollapsiblePane::SetLabel(str); + // FIXME: we need to update our collapsed width in some way but using GetBestSize() + // we may get the size of the control with the pane size summed up if we are expanded! + //m_szCollapsed.x = GetBestSize().x; } void wxCollapsiblePane::OnSize(wxSizeEvent &ev) @@ -287,5 +274,5 @@ void wxCollapsiblePane::OnSize(wxSizeEvent &ev) m_pPane->Layout(); } -#endif // wxUSE_COLLPANE && defined(__WXGTK24__) && !defined(__WXUNIVERSAL__) +#endif // wxUSE_COLLPANE && !defined(__WXUNIVERSAL__) diff --git a/src/gtk/colordlg.cpp b/src/gtk/colordlg.cpp index 20bacbb9e2..ccb80aadc1 100644 --- a/src/gtk/colordlg.cpp +++ b/src/gtk/colordlg.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_COLOURDLG && defined(__WXGTK20__) +#if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -140,5 +140,5 @@ void wxColourDialog::DialogToColourData() g_free(pal); } -#endif // wxUSE_COLOURDLG && defined(__WXGTK20__) +#endif // wxUSE_COLOURDLG diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index 63a370d1cb..1fdea4fd20 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -21,148 +21,12 @@ #include "wx/arrstr.h" #endif -// We use GtkCombo which has been deprecated since GTK+ 2.3.0 -// in favour of GtkComboBox for