Minor changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-11-26 17:41:20 +00:00
parent b16088bf11
commit 72a7edf007
10 changed files with 94 additions and 23 deletions

View File

@@ -33,22 +33,26 @@ wxMask::wxMask()
wxMask::wxMask( const wxBitmap& bitmap, const wxColour& colour )
{
m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, colour );
}
wxMask::wxMask( const wxBitmap& bitmap, int paletteIndex )
{
m_bitmap = (GdkBitmap *) NULL;
Create( bitmap, paletteIndex );
}
wxMask::wxMask( const wxBitmap& bitmap )
{
m_bitmap = (GdkBitmap *) NULL;
Create( bitmap );
}
wxMask::~wxMask()
{
if (m_bitmap) gdk_bitmap_unref( m_bitmap );
if (m_bitmap)
gdk_bitmap_unref( m_bitmap );
}
bool wxMask::Create( const wxBitmap& WXUNUSED(bitmap),

View File

@@ -490,9 +490,11 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
/* store requested format to be asked for by callbacks */
m_targetRequested = format;
#if 0
wxLogTrace( TRACE_CLIPBOARD,
wxT("wxClipboard:IsSupported: requested format: %s"),
format.GetId().c_str() );
#endif
wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );

View File

@@ -405,11 +405,11 @@ void wxRadioBox::SetSelection( int n )
GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
DisableEvents();
GtkDisableEvents();
gtk_toggle_button_set_state( button, 1 );
EnableEvents();
GtkEnableEvents();
}
int wxRadioBox::GetSelection(void) const
@@ -575,7 +575,7 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
wxFAIL_MSG(wxT("wxRadioBox::SetNumberOfRowsOrCols not implemented."));
}
void wxRadioBox::DisableEvents()
void wxRadioBox::GtkDisableEvents()
{
wxNode *node = m_boxes.First();
while (node)
@@ -587,7 +587,7 @@ void wxRadioBox::DisableEvents()
}
}
void wxRadioBox::EnableEvents()
void wxRadioBox::GtkEnableEvents()
{
wxNode *node = m_boxes.First();
while (node)
@@ -618,6 +618,19 @@ void wxRadioBox::ApplyWidgetStyle()
}
}
#if wxUSE_TOOLTIPS
void wxRadioBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
{
wxNode *node = m_boxes.First();
while (node)
{
GtkWidget *widget = GTK_WIDGET( node->Data() );
gtk_tooltips_set_tip( tips, widget, wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
node = node->Next();
}
}
#endif // wxUSE_TOOLTIPS
bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
{
if (window == m_widget->window) return TRUE;