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

replaced T() makro with wxT() due to namespace probs, _T() exists, too

Browse Source 
fixed compilation problems, mainly in html code
compiles and links fine on Solaris, runs with samples and Mahogany


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1999-10-08 14:35:56 +00:00
parent b4a2ab728b
commit 223d09f6b5
336 changed files with 3755 additions and 3776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gtk1/listbox.cpp
View File

@@ -259,7 +259,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( T("wxListBox creation failed") );
wxFAIL_MSG( wxT("wxListBox creation failed") );
return FALSE;
}
@@ -369,11 +369,11 @@ wxListBox::~wxListBox()
void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *children = m_list->children;
int length = g_list_length(children);
wxCHECK_RET( pos <= length, T("invalid index in wxListBox::InsertItems") );
wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
// VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
// into a listbox at the given position, this is why we first delete
@@ -471,7 +471,7 @@ void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
void wxListBox::AppendCommon( const wxString &item )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GtkWidget *list_item;
@@ -570,7 +570,7 @@ void wxListBox::Append( const wxString &item, wxClientData *clientData )
void wxListBox::SetClientData( int n, void* clientData )
{
wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return;
@@ -580,7 +580,7 @@ void wxListBox::SetClientData( int n, void* clientData )
void* wxListBox::GetClientData( int n )
{
wxCHECK_MSG( m_widget != NULL, NULL, T("invalid combobox") );
wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
wxNode *node = m_clientDataList.Nth( n );
if (!node) return NULL;
@@ -590,7 +590,7 @@ void* wxListBox::GetClientData( int n )
void wxListBox::SetClientObject( int n, wxClientData* clientData )
{
wxCHECK_RET( m_widget != NULL, T("invalid combobox") );
wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return;
@@ -603,7 +603,7 @@ void wxListBox::SetClientObject( int n, wxClientData* clientData )
wxClientData* wxListBox::GetClientObject( int n )
{
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, T("invalid combobox") );
wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
wxNode *node = m_clientObjectList.Nth( n );
if (!node) return (wxClientData*) NULL;
@@ -613,7 +613,7 @@ wxClientData* wxListBox::GetClientObject( int n )
void wxListBox::Clear()
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
gtk_list_clear_items( m_list, 0, Number() );
@@ -631,11 +631,11 @@ void wxListBox::Clear()
void wxListBox::Delete( int n )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
wxCHECK_RET( child, T("wrong listbox index") );
wxCHECK_RET( child, wxT("wrong listbox index") );
GList *list = g_list_append( (GList*) NULL, child->data );
gtk_list_remove_items( m_list, list );
@@ -658,7 +658,7 @@ void wxListBox::Delete( int n )
void wxListBox::Deselect( int n )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
DisableEvents();
@@ -669,7 +669,7 @@ void wxListBox::Deselect( int n )
int wxListBox::FindString( const wxString &item ) const
{
wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
@@ -694,7 +694,7 @@ int wxListBox::FindString( const wxString &item ) const
int wxListBox::GetSelection() const
{
wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
@@ -709,7 +709,7 @@ int wxListBox::GetSelection() const
int wxListBox::GetSelections( wxArrayInt& aSelections ) const
{
wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
// get the number of selected items first
GList *child = m_list->children;
@@ -739,7 +739,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
wxString wxListBox::GetString( int n ) const
{
wxCHECK_MSG( m_list != NULL, T(""), T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
if (child)
@@ -752,14 +752,14 @@ wxString wxListBox::GetString( int n ) const
return str;
}
wxFAIL_MSG(T("wrong listbox index"));
wxFAIL_MSG(wxT("wrong listbox index"));
return T("");
return wxT("");
}
wxString wxListBox::GetStringSelection() const
{
wxCHECK_MSG( m_list != NULL, T(""), T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
GList *selection = m_list->selection;
if (selection)
@@ -772,13 +772,13 @@ wxString wxListBox::GetStringSelection() const
return str;
}
wxFAIL_MSG(T("no listbox selection available"));
return T("");
wxFAIL_MSG(wxT("no listbox selection available"));
return wxT("");
}
int wxListBox::Number()
{
wxCHECK_MSG( m_list != NULL, -1, T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
GList *child = m_list->children;
int count = 0;
@@ -788,7 +788,7 @@ int wxListBox::Number()
bool wxListBox::Selected( int n )
{
wxCHECK_MSG( m_list != NULL, FALSE, T("invalid listbox") );
wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
GList *target = g_list_nth( m_list->children, n );
if (target)
@@ -800,28 +800,28 @@ bool wxListBox::Selected( int n )
child = child->next;
}
}
wxFAIL_MSG(T("wrong listbox index"));
wxFAIL_MSG(wxT("wrong listbox index"));
return FALSE;
}
void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
{
wxFAIL_MSG(T("wxListBox::Set not implemented"));
wxFAIL_MSG(wxT("wxListBox::Set not implemented"));
}
void wxListBox::SetFirstItem( int WXUNUSED(n) )
{
wxFAIL_MSG(T("wxListBox::SetFirstItem not implemented"));
wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
}
void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
{
wxFAIL_MSG(T("wxListBox::SetFirstItem not implemented"));
wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
}
void wxListBox::SetSelection( int n, bool select )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
DisableEvents();
@@ -835,7 +835,7 @@ void wxListBox::SetSelection( int n, bool select )
void wxListBox::SetString( int n, const wxString &string )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
GList *child = g_list_nth( m_list->children, n );
if (child)
@@ -854,13 +854,13 @@ void wxListBox::SetString( int n, const wxString &string )
}
else
{
wxFAIL_MSG(T("wrong listbox index"));
wxFAIL_MSG(wxT("wrong listbox index"));
}
}
void wxListBox::SetStringSelection( const wxString &string, bool select )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
SetSelection( FindString(string), select );
}
@@ -896,7 +896,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
#if wxUSE_DRAG_AND_DROP
void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
{
wxCHECK_RET( m_list != NULL, T("invalid listbox") );
wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
#ifndef NEW_GTK_DND_CODE
if (m_dropTarget)