X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5cb0f77dfea18f86608d922091a800e3edbcf35f..a24dc1a836159cbec24c577d9e576f8dbafad728:/src/msw/tabctrl.cpp?ds=sidebyside diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index 2d2b30c7f1..acbfd871c4 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "tabctrl.h" #endif @@ -26,13 +26,9 @@ #if defined(__WIN95__) -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) -#include "malloc.h" -#endif - -#include +#include "wx/msw/private.h" -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) +#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) #include #else #include "wx/msw/gnuwin32/extra.h" @@ -40,7 +36,6 @@ #include "wx/tabctrl.h" #include "wx/app.h" -#include "wx/msw/private.h" #include "wx/msw/imaglist.h" IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) @@ -89,7 +84,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons m_windowId = (id < 0 ? NewControlId() : id); - long tabStyle = WS_CHILD; + long tabStyle = WS_CHILD | WS_VISIBLE; if (m_windowStyle & wxTC_MULTILINE) tabStyle |= TCS_MULTILINE; if (m_windowStyle & wxTC_RIGHTJUSTIFY) @@ -101,12 +96,14 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons if (m_windowStyle & wxBORDER) tabStyle |= WS_BORDER; +#ifndef __WXWINCE__ tabStyle |= TCS_TOOLTIPS; +#endif // Create the toolbar control. HWND hWndTabCtrl = CreateWindowEx(0L, // No extended styles. WC_TABCONTROL, // Class name for the tab control - wxT(""), // No default text. + wxEmptyString, // No default text. tabStyle, // Styles and defaults. x, y, width, height, // Standard size and position. (HWND) parent->GetHWND(), // Parent window @@ -144,13 +141,14 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) eventType = wxEVT_COMMAND_TAB_SEL_CHANGING; break; +#ifndef __WXWINCE__ case TTN_NEEDTEXT: { // TODO // if (tool->m_shortHelpString != "") // ttText->lpszText = (char *) (const char *)tool->m_shortHelpString; } - +#endif default : return wxControl::MSWOnNotify(idCtrl, lParam, result); } @@ -237,7 +235,7 @@ int wxTabCtrl::GetRowCount() const wxString wxTabCtrl::GetItemText(int item) const { wxChar buf[256]; - wxString str(wxT("")); + wxString str(wxEmptyString); TC_ITEM tcItem; tcItem.mask = TCIF_TEXT; tcItem.pszText = buf; @@ -299,7 +297,7 @@ bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* da TC_ITEM tcItem; tcItem.mask = TCIF_PARAM; tcItem.lParam = (long) data; - if (text != wxT("")) + if (text != wxEmptyString) { tcItem.mask |= TCIF_TEXT; wxStrcpy(buf, (const wxChar*) text);