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

OK, while I wait for the non-Unicode build to compile, I can report

Browse Source 
that now all files in gtk/ compiles in Unicode mode. unix/ is still
missing, but that probably wouldn't take too long.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
1999-04-15 14:36:04 +00:00
parent 95dee6514a
commit 05939a8140
10 changed files with 446 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gtk1/tbargtk.cpp
View File

@@ -204,13 +204,13 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
m_hasToolAlready = TRUE;
wxCHECK_MSG( bitmap.Ok(), (wxToolBarTool *)NULL,
"invalid bitmap for wxToolBar icon" );
_T("invalid bitmap for wxToolBar icon") );
wxCHECK_MSG( bitmap.GetBitmap() == NULL, (wxToolBarTool *)NULL,
"wxToolBar doesn't support GdkBitmap" );
_T("wxToolBar doesn't support GdkBitmap") );
wxCHECK_MSG( bitmap.GetPixmap() != NULL, (wxToolBarTool *)NULL,
"wxToolBar::Add needs a wxBitmap" );
_T("wxToolBar::Add needs a wxBitmap") );
GtkWidget *tool_pixmap = (GtkWidget *)NULL;
@@ -238,7 +238,7 @@ wxToolBarTool *wxToolBar::AddTool( int toolIndex, const wxBitmap& bitmap,
ctype,
(GtkWidget *)NULL,
(const char *)NULL,
helpString1,
helpString1.mbc_str(),
"",
tool_pixmap,
(GtkSignalFunc)gtk_toolbar_callback,
@@ -264,7 +264,7 @@ void wxToolBar::AddSeparator()
void wxToolBar::ClearTools()
{
wxFAIL_MSG( "wxToolBar::ClearTools not implemented" );
wxFAIL_MSG( _T("wxToolBar::ClearTools not implemented") );
}
bool wxToolBar::Realize()
@@ -314,7 +314,7 @@ void wxToolBar::EnableTool(int toolIndex, bool enable)
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
}
void wxToolBar::ToggleTool( int toolIndex, bool toggle )
@@ -333,7 +333,7 @@ void wxToolBar::ToggleTool( int toolIndex, bool toggle )
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
}
wxObject *wxToolBar::GetToolClientData( int index ) const
@@ -346,7 +346,7 @@ wxObject *wxToolBar::GetToolClientData( int index ) const
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return (wxObject*)NULL;
}
@@ -361,7 +361,7 @@ bool wxToolBar::GetToolState(int toolIndex) const
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return FALSE;
}
@@ -376,14 +376,14 @@ bool wxToolBar::GetToolEnabled(int toolIndex) const
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return FALSE;
}
void wxToolBar::SetMargins( int x, int y )
{
wxCHECK_RET( !m_hasToolAlready, "wxToolBar::SetMargins must be called before adding tool." );
wxCHECK_RET( !m_hasToolAlready, _T("wxToolBar::SetMargins must be called before adding tool.") );
if (x > 2) gtk_toolbar_append_space( m_toolbar ); // oh well
@@ -393,7 +393,7 @@ void wxToolBar::SetMargins( int x, int y )
void wxToolBar::SetToolPacking( int WXUNUSED(packing) )
{
wxFAIL_MSG( "wxToolBar::SetToolPacking not implemented" );
wxFAIL_MSG( _T("wxToolBar::SetToolPacking not implemented") );
}
void wxToolBar::SetToolSeparation( int separation )
@@ -425,9 +425,9 @@ wxString wxToolBar::GetToolLongHelp(int toolIndex)
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return "";
return _T("");
}
wxString wxToolBar::GetToolShortHelp(int toolIndex)
@@ -443,9 +443,9 @@ wxString wxToolBar::GetToolShortHelp(int toolIndex)
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return "";
return _T("");
}
void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
@@ -462,7 +462,7 @@ void wxToolBar::SetToolLongHelp(int toolIndex, const wxString& helpString)
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return;
}
@@ -481,7 +481,7 @@ void wxToolBar::SetToolShortHelp(int toolIndex, const wxString& helpString)
node = node->Next();
}
wxFAIL_MSG( "wrong toolbar index" );
wxFAIL_MSG( _T("wrong toolbar index") );
return;
}