Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Did much work on colors. It doesn't work and I guess

Browse Source 
it's a GTK bug.
  Small change to Blit()
  Added GTK_NO_TYPE_CHECK when compiling without debug_flag
  Added more wxCHECK_XXX


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-10-26 00:19:25 +00:00
parent 019bf1286f
commit f96aa4d9eb
49 changed files with 1004 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
src/gtk1/listbox.cpp
View File

@@ -2,9 +2,8 @@
// Name: listbox.cpp
// Purpose:
// Author: Robert Roebling
// Created: 01/02/97
// Id:
// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -124,6 +123,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
gtk_widget_realize( GTK_WIDGET(m_list) );
SetBackgroundColour( parent->GetBackgroundColour() );
Show( TRUE );
return TRUE;
@@ -136,7 +137,7 @@ void wxListBox::Append( const wxString &item )
void wxListBox::Append( const wxString &item, char *clientData )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
GtkWidget *list_item = gtk_list_item_new_with_label( item );
@@ -145,11 +146,7 @@ void wxListBox::Append( const wxString &item, char *clientData )
GtkBin *bin = GTK_BIN( list_item );
gtk_widget_set_style( bin->child,
gtk_style_ref(
gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
gtk_widget_set_style( GTK_WIDGET(bin),
gtk_style_ref(
gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
gtk_widget_get_style( m_widget ) ) );
}
gtk_signal_connect( GTK_OBJECT(list_item), "select",
@@ -172,7 +169,7 @@ void wxListBox::Append( const wxString &item, char *clientData )
void wxListBox::Clear(void)
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
gtk_list_clear_items( m_list, 0, Number() );
@@ -181,7 +178,7 @@ void wxListBox::Clear(void)
void wxListBox::Delete( int n )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
GList *child = g_list_nth( m_list->children, n );
@@ -206,14 +203,14 @@ void wxListBox::Delete( int n )
void wxListBox::Deselect( int n )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
gtk_list_unselect_item( m_list, n );
}
int wxListBox::FindString( const wxString &item ) const
{
wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
GList *child = m_list->children;
int count = 0;
@@ -235,7 +232,7 @@ int wxListBox::FindString( const wxString &item ) const
char *wxListBox::GetClientData( int n ) const
{
wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, (char*) NULL, "invalid listbox" );
wxNode *node = m_clientData.Nth( n );
if (node) return ((char*)node->Data());
@@ -246,7 +243,7 @@ char *wxListBox::GetClientData( int n ) const
int wxListBox::GetSelection(void) const
{
wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
GList *child = m_list->children;
int count = 0;
@@ -261,7 +258,7 @@ int wxListBox::GetSelection(void) const
int wxListBox::GetSelections(wxArrayInt& aSelections) const
{
wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
// get the number of selected items first
GList *child = m_list->children;
@@ -290,7 +287,7 @@ int wxListBox::GetSelections(wxArrayInt& aSelections) const
wxString wxListBox::GetString( int n ) const
{
wxCHECK_MSG( m_list != NULL, "", "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
GList *child = g_list_nth( m_list->children, n );
if (child)
@@ -305,7 +302,7 @@ wxString wxListBox::GetString( int n ) const
wxString wxListBox::GetStringSelection(void) const
{
wxCHECK_MSG( m_list != NULL, "", "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, "", "invalid listbox" );
GList *selection = m_list->selection;
if (selection)
@@ -320,7 +317,7 @@ wxString wxListBox::GetStringSelection(void) const
int wxListBox::Number(void)
{
wxCHECK_MSG( m_list != NULL, -1, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, -1, "invalid listbox" );
GList *child = m_list->children;
int count = 0;
@@ -330,7 +327,7 @@ int wxListBox::Number(void)
bool wxListBox::Selected( int n )
{
wxCHECK_MSG( m_list != NULL, FALSE, "invalid list ctrl" );
wxCHECK_MSG( m_list != NULL, FALSE, "invalid listbox" );
GList *target = g_list_nth( m_list->children, n );
if (target)
@@ -353,7 +350,7 @@ void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
void wxListBox::SetClientData( int n, char *clientData )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
wxNode *node = m_clientData.Nth( n );
if (node)
@@ -378,7 +375,7 @@ void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
void wxListBox::SetSelection( int n, bool select )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
if (select)
gtk_list_select_item( m_list, n );
@@ -388,7 +385,7 @@ void wxListBox::SetSelection( int n, bool select )
void wxListBox::SetString( int n, const wxString &string )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
GList *child = g_list_nth( m_list->children, n );
if (child)
@@ -405,7 +402,7 @@ void wxListBox::SetString( int n, const wxString &string )
void wxListBox::SetStringSelection( const wxString &string, bool select )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
SetSelection( FindString(string), select );
}
@@ -428,7 +425,7 @@ int wxListBox::GetIndex( GtkWidget *item ) const
void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
wxCHECK_RET( m_list != NULL, "invalid listbox" );
GList *child = m_list->children;
while (child)
@@ -452,43 +449,6 @@ GtkWidget *wxListBox::GetConnectWidget(void)
return GTK_WIDGET(m_list);
}
void wxListBox::SetFont( const wxFont &font )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
if (((wxFont*)&font)->Ok())
m_font = font;
else
m_font = *wxSWISS_FONT;
GtkStyle *style = (GtkStyle*) NULL;
if (!m_hasOwnStyle)
{
m_hasOwnStyle = TRUE;
style = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(m_list) ) );
}
else
{
style = gtk_widget_get_style( GTK_WIDGET(m_list) );
}
gdk_font_unref( style->font );
style->font = gdk_font_ref( m_font.GetInternalFont( 1.0 ) );
gtk_widget_set_style( GTK_WIDGET(m_list), style );
GList *child = m_list->children;
while (child)
{
GtkBin *bin = (GtkBin*) child->data;
gtk_widget_set_style( bin->child,
gtk_style_ref(
gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
child = child->next;
}
}
bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
{
if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
@@ -504,38 +464,50 @@ bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
return FALSE;
}
void wxListBox::SetBackgroundColour( const wxColour &colour )
void wxListBox::SetFont( const wxFont &font )
{
wxCHECK_RET( m_list != NULL, "invalid list ctrl" );
m_backgroundColour = colour;
if (!m_backgroundColour.Ok()) return;
wxCHECK_RET( m_list != NULL, "invalid listbox" );
SetBackgroundColourHelper( GTK_WIDGET(m_list)->window );
GtkStyle *style = (GtkStyle*) NULL;
if (!m_hasOwnStyle)
{
m_hasOwnStyle = TRUE;
style = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(m_list) ) );
}
else
{
style = gtk_widget_get_style( GTK_WIDGET(m_list) );
}
style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor();
gtk_widget_set_style( GTK_WIDGET(m_list), style );
wxControl::SetFont( font );
GList *child = m_list->children;
while (child)
{
GtkWidget *item = GTK_WIDGET(child->data);
gtk_widget_set_style( item,
gtk_style_ref(
gtk_widget_get_style( GTK_WIDGET(m_list) ) ) );
gtk_widget_set_style( GTK_BIN(child->data)->child,
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
child = child->next;
}
}
void wxListBox::SetBackgroundColour( const wxColour &colour )
{
return;
wxCHECK_RET( m_list != NULL, "invalid listbox" );
wxControl::SetBackgroundColour( colour );
return;
if (!m_backgroundColour.Ok()) return;
gtk_widget_set_style( GTK_WIDGET(m_list),
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
GList *child = m_list->children;
while (child)
{
gtk_widget_set_style( GTK_WIDGET(child->data),
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
gtk_widget_set_style( GTK_BIN(child->data)->child,
gtk_style_ref(
gtk_widget_get_style( m_widget ) ) );
child = child->next;
}
}