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

40
src/gtk1/choice.cpp
View File

@@ -75,7 +75,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, validator, name ))
{
wxFAIL_MSG( T("wxChoice creation failed") );
wxFAIL_MSG( wxT("wxChoice creation failed") );
return FALSE;
}
@@ -125,7 +125,7 @@ wxChoice::~wxChoice()
void wxChoice::AppendCommon( const wxString &item )
{
wxCHECK_RET( m_widget != NULL, T("invalid choice") );
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
GtkWidget *menu_item = gtk_menu_item_new_with_label( item.mbc_str() );
@@ -172,7 +172,7 @@ void wxChoice::Append( const wxString &item, wxClientData *clientData )
void wxChoice::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;
@@ -182,7 +182,7 @@ void wxChoice::SetClientData( int n, void* clientData )
void* wxChoice::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;
@@ -192,7 +192,7 @@ void* wxChoice::GetClientData( int n )
void wxChoice::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;
@@ -205,7 +205,7 @@ void wxChoice::SetClientObject( int n, wxClientData* clientData )
wxClientData* wxChoice::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;
@@ -215,7 +215,7 @@ wxClientData* wxChoice::GetClientObject( int n )
void wxChoice::Clear()
{
wxCHECK_RET( m_widget != NULL, T("invalid choice") );
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
GtkWidget *menu = gtk_menu_new();
@@ -235,12 +235,12 @@ void wxChoice::Clear()
void wxChoice::Delete( int WXUNUSED(n) )
{
wxFAIL_MSG( T("wxChoice:Delete not implemented") );
wxFAIL_MSG( wxT("wxChoice:Delete not implemented") );
}
int wxChoice::FindString( const wxString &string ) const
{
wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
// If you read this code once and you think you understand
// it, then you are very wrong. Robert Roebling.
@@ -255,7 +255,7 @@ int wxChoice::FindString( const wxString &string ) const
if (bin->child) label = GTK_LABEL(bin->child);
if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
if (string == wxString(label->label,*wxConvCurrent))
return count;
@@ -274,7 +274,7 @@ int wxChoice::GetColumns() const
int wxChoice::GetSelection()
{
wxCHECK_MSG( m_widget != NULL, -1, T("invalid choice") );
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
@@ -292,7 +292,7 @@ int wxChoice::GetSelection()
wxString wxChoice::GetString( int n ) const
{
wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
@@ -306,7 +306,7 @@ wxString wxChoice::GetString( int n ) const
if (bin->child) label = GTK_LABEL(bin->child);
if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
return wxString(label->label,*wxConvCurrent);
}
@@ -314,25 +314,25 @@ wxString wxChoice::GetString( int n ) const
count++;
}
wxFAIL_MSG( T("wxChoice: invalid index in GetString()") );
wxFAIL_MSG( wxT("wxChoice: invalid index in GetString()") );
return T("");
return wxT("");
}
wxString wxChoice::GetStringSelection() const
{
wxCHECK_MSG( m_widget != NULL, T(""), T("invalid choice") );
wxCHECK_MSG( m_widget != NULL, wxT(""), wxT("invalid choice") );
GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
wxASSERT_MSG( label != NULL , T("wxChoice: invalid label") );
wxASSERT_MSG( label != NULL , wxT("wxChoice: invalid label") );
return wxString(label->label,*wxConvCurrent);
}
int wxChoice::Number() const
{
wxCHECK_MSG( m_widget != NULL, 0, T("invalid choice") );
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
@@ -351,7 +351,7 @@ void wxChoice::SetColumns( int WXUNUSED(n) )
void wxChoice::SetSelection( int n )
{
wxCHECK_RET( m_widget != NULL, T("invalid choice") );
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
int tmp = n;
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
@@ -359,7 +359,7 @@ void wxChoice::SetSelection( int n )
void wxChoice::SetStringSelection( const wxString &string )
{
wxCHECK_RET( m_widget != NULL, T("invalid choice") );
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
int n = FindString( string );
if (n != -1) SetSelection( n );