A few weeks of Unicode fixes (my old win95 laptop compiles sloowly,
especially when through the nullmodem cable). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -114,7 +114,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
|
||||
// Create the toolbar control.
|
||||
HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles.
|
||||
WC_TABCONTROL, // Class name for the tab control
|
||||
"", // No default text.
|
||||
_T(""), // No default text.
|
||||
WS_CHILD | WS_BORDER | WS_VISIBLE | tabStyle, // Styles and defaults.
|
||||
x, y, width, height, // Standard size and position.
|
||||
(HWND) parent->GetHWND(), // Parent window
|
||||
@@ -241,8 +241,8 @@ int wxTabCtrl::GetRowCount() const
|
||||
// Get the item text
|
||||
wxString wxTabCtrl::GetItemText(int item) const
|
||||
{
|
||||
char buf[256];
|
||||
wxString str("");
|
||||
wxChar buf[256];
|
||||
wxString str(_T(""));
|
||||
TC_ITEM tcItem;
|
||||
tcItem.mask = TCIF_TEXT;
|
||||
tcItem.pszText = buf;
|
||||
@@ -300,14 +300,14 @@ int wxTabCtrl::HitTest(const wxPoint& pt, long& flags)
|
||||
// Insert an item
|
||||
bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
|
||||
{
|
||||
char buf[256];
|
||||
wxChar buf[256];
|
||||
TC_ITEM tcItem;
|
||||
tcItem.mask = TCIF_PARAM;
|
||||
tcItem.lParam = (long) data;
|
||||
if (text != "")
|
||||
if (text != _T(""))
|
||||
{
|
||||
tcItem.mask |= TCIF_TEXT;
|
||||
strcpy(buf, (const char*) text);
|
||||
wxStrcpy(buf, (const wxChar*) text);
|
||||
tcItem.pszText = buf;
|
||||
tcItem.cchTextMax = 256;
|
||||
}
|
||||
@@ -336,10 +336,10 @@ void wxTabCtrl::SetImageList(wxImageList* imageList)
|
||||
// Set the text for an item
|
||||
bool wxTabCtrl::SetItemText(int item, const wxString& text)
|
||||
{
|
||||
char buf[256];
|
||||
wxChar buf[256];
|
||||
TC_ITEM tcItem;
|
||||
tcItem.mask = TCIF_TEXT;
|
||||
strcpy(buf, (const char*) text);
|
||||
wxStrcpy(buf, (const wxChar*) text);
|
||||
tcItem.pszText = buf;
|
||||
tcItem.cchTextMax = 256;
|
||||
|
||||
|
Reference in New Issue
Block a user