From b342f8f0a604f553accba543b7feaf62dcc1df08 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 14 Jul 2001 03:23:30 +0000 Subject: [PATCH] Added RTTI macros to wxToolTip git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/tooltip.h | 2 ++ include/wx/gtk1/tooltip.h | 2 ++ include/wx/msw/tooltip.h | 2 ++ src/gtk/tooltip.cpp | 10 ++++++---- src/gtk1/tooltip.cpp | 10 ++++++---- src/msw/tooltip.cpp | 2 ++ 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/include/wx/gtk/tooltip.h b/include/wx/gtk/tooltip.h index eed2386111..9d92dd3f6f 100644 --- a/include/wx/gtk/tooltip.h +++ b/include/wx/gtk/tooltip.h @@ -51,6 +51,8 @@ public: private: wxString m_text; wxWindow *m_window; + + DECLARE_ABSTRACT_CLASS(wxToolTip) }; #endif // __GTKTOOLTIPH__ diff --git a/include/wx/gtk1/tooltip.h b/include/wx/gtk1/tooltip.h index eed2386111..9d92dd3f6f 100644 --- a/include/wx/gtk1/tooltip.h +++ b/include/wx/gtk1/tooltip.h @@ -51,6 +51,8 @@ public: private: wxString m_text; wxWindow *m_window; + + DECLARE_ABSTRACT_CLASS(wxToolTip) }; #endif // __GTKTOOLTIPH__ diff --git a/include/wx/msw/tooltip.h b/include/wx/msw/tooltip.h index d79dbfd01d..d1b1cb3b9c 100644 --- a/include/wx/msw/tooltip.h +++ b/include/wx/msw/tooltip.h @@ -53,5 +53,7 @@ private: wxString m_text; // tooltip text wxWindow *m_window; // window we're associated with + + DECLARE_ABSTRACT_CLASS(wxToolTip) }; diff --git a/src/gtk/tooltip.cpp b/src/gtk/tooltip.cpp index 109f4658a6..ec256d13be 100644 --- a/src/gtk/tooltip.cpp +++ b/src/gtk/tooltip.cpp @@ -35,6 +35,8 @@ static GdkColor ss_fg; // wxToolTip //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) + wxToolTip::wxToolTip( const wxString &tip ) { m_text = tip; @@ -67,16 +69,16 @@ void wxToolTip::Apply( wxWindow *win ) #if (GTK_MINOR_VERSION > 0) gtk_tooltips_force_window( ss_tooltips ); - - GtkStyle *g_style = + + GtkStyle *g_style = gtk_style_copy( gtk_widget_get_style( ss_tooltips->tip_window ) ); - + g_style->fg[GTK_STATE_NORMAL] = ss_fg; g_style->bg[GTK_STATE_NORMAL] = ss_bg; gdk_font_unref( g_style->font ); g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() ); - + gtk_widget_set_style( ss_tooltips->tip_window, g_style ); #else gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); diff --git a/src/gtk1/tooltip.cpp b/src/gtk1/tooltip.cpp index 109f4658a6..ec256d13be 100644 --- a/src/gtk1/tooltip.cpp +++ b/src/gtk1/tooltip.cpp @@ -35,6 +35,8 @@ static GdkColor ss_fg; // wxToolTip //----------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) + wxToolTip::wxToolTip( const wxString &tip ) { m_text = tip; @@ -67,16 +69,16 @@ void wxToolTip::Apply( wxWindow *win ) #if (GTK_MINOR_VERSION > 0) gtk_tooltips_force_window( ss_tooltips ); - - GtkStyle *g_style = + + GtkStyle *g_style = gtk_style_copy( gtk_widget_get_style( ss_tooltips->tip_window ) ); - + g_style->fg[GTK_STATE_NORMAL] = ss_fg; g_style->bg[GTK_STATE_NORMAL] = ss_bg; gdk_font_unref( g_style->font ); g_style->font = gdk_font_ref( GtkGetDefaultGuiFont() ); - + gtk_widget_set_style( ss_tooltips->tip_window, g_style ); #else gtk_tooltips_set_colors( ss_tooltips, &ss_bg, &ss_fg ); diff --git a/src/msw/tooltip.cpp b/src/msw/tooltip.cpp index e8b34e7da0..930748cdbf 100644 --- a/src/msw/tooltip.cpp +++ b/src/msw/tooltip.cpp @@ -240,6 +240,8 @@ void wxToolTip::RelayEvent(WXMSG *msg) // ctor & dtor // ---------------------------------------------------------------------------- +IMPLEMENT_ABSTRACT_CLASS(wxToolTip, wxObject) + wxToolTip::wxToolTip(const wxString &tip) : m_text(tip) { -- 2.45.2