X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c9a19aabab3a878b565e6c2a5f2a3824277c4dc..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/tabctrl.cpp diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index 27278e64c9..02a8285cc4 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: tabctrl.cpp +// Name: src/msw/tabctrl.cpp // Purpose: wxTabCtrl // Author: Julian Smart // Modified by: @@ -9,39 +9,24 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "tabctrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop -#endif - -#ifndef WX_PRECOMP -#include "wx/wx.h" + #pragma hdrstop #endif -#if defined(__WIN95__) +#if wxUSE_TAB_DIALOG -#if !defined(__GNUWIN32__) && !defined(__SALFORDC__) -#include "malloc.h" +#ifndef WX_PRECOMP + #include "wx/msw/wrapcctl.h" // include "properly" + #include "wx/wx.h" + #include "wx/app.h" #endif -#include - -#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__)) - #include -#else - #include "wx/msw/gnuwin32/extra.h" -#endif +#include "wx/msw/private.h" -#include "wx/msw/dib.h" #include "wx/tabctrl.h" -#include "wx/app.h" -#include "wx/msw/private.h" #include "wx/msw/imaglist.h" IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl) @@ -90,7 +75,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) @@ -102,12 +87,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 @@ -117,12 +104,12 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons m_hWnd = (WXHWND) hWndTabCtrl; if (parent) parent->AddChild(this); - + SubclassWin((WXHWND) hWndTabCtrl); SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); - return TRUE; + return true; } wxTabCtrl::~wxTabCtrl() @@ -133,7 +120,7 @@ wxTabCtrl::~wxTabCtrl() bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) { wxTabEvent event(wxEVT_NULL, m_windowId); - wxEventType eventType = wxEVT_NULL; + wxEventType eventType wxDUMMY_INITIALIZE(wxEVT_NULL); NMHDR* hdr1 = (NMHDR*) lParam; switch ( hdr1->code ) { @@ -145,13 +132,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 != "") +// if (!tool->m_shortHelpString.empty()) // ttText->lpszText = (char *) (const char *)tool->m_shortHelpString; } - +#endif default : return wxControl::MSWOnNotify(idCtrl, lParam, result); } @@ -161,7 +149,7 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) event.SetInt(idCtrl) ; event.SetSelection(idCtrl); - return ProcessEvent(event); + return HandleWindowEvent(event); } // Responds to colour changes, and passes event on to children. @@ -218,13 +206,13 @@ bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const { RECT rect; if ( !TabCtrl_GetItemRect( (HWND) GetHWND(), item, & rect) ) - return FALSE; + return false; else { wxrect.x = rect.left; wxrect.y = rect.top; wxrect.width = rect.right - rect.left; wxrect.height = rect.bottom - rect.top; - return TRUE; + return true; } } @@ -238,7 +226,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; @@ -300,7 +288,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.empty()) { tcItem.mask |= TCIF_TEXT; wxStrcpy(buf, (const wxChar*) text); @@ -326,7 +314,7 @@ int wxTabCtrl::SetSelection(int item) void wxTabCtrl::SetImageList(wxImageList* imageList) { m_imageList = imageList; - TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() ); + (void) TabCtrl_SetImageList( (HWND) GetHWND(), (HIMAGELIST) imageList->GetHIMAGELIST() ); } // Set the text for an item @@ -441,5 +429,4 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height) } #endif -#endif - // __WIN95__ +#endif // wxUSE_TAB_DIALOG