// Created: 10/12/99
// RCS-ID: $Id$
// Copyright: (c) David Webster
-// Licence: wxWidgets licence
+// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
// ----------------------------------------------------------------------------
// check that the page index is valid
-#define IS_VALID_PAGE(nPage) (((nPage) >= 0) && ((nPage) < GetPageCount()))
+#define IS_VALID_PAGE(nPage) ( \
+ /* size_t is _always_ >= 0 */ \
+ /* ((nPage) >= 0) && */ \
+ ((nPage) < GetPageCount()) \
+ )
// hide the ugly cast
#define m_hWnd (HWND)GetHWND()
//
// Create() function
//
-bool wxNotebook::Create(
- wxWindow* pParent
-, wxWindowID vId
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-, const wxString& rsName
-)
+bool wxNotebook::Create( wxWindow* pParent,
+ wxWindowID vId,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxString& rsName )
{
//
// Base init
,wxDefaultValidator
,rsName
))
- return FALSE;
+ return false;
//
// Notebook, so explicitly specify 0 as last parameter
//
- if (!OS2CreateControl( "NOTEBOOK"
- ,_T("")
+ if (!OS2CreateControl( wxT("NOTEBOOK")
+ ,wxEmptyString
,rPos
,rSize
,lStyle | wxTAB_TRAVERSAL
))
- return FALSE;
+ return false;
SetBackgroundColour(wxColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)));
- return TRUE;
+ return true;
} // end of wxNotebook::Create
WXDWORD wxNotebook::OS2GetStyle (
,pdwExstyle
);
- dwTabStyle |= WS_TABSTOP | BKS_SOLIDBIND | BKS_ROUNDEDTABS | BKS_TABTEXTCENTER;
+ dwTabStyle |= WS_TABSTOP | BKS_SOLIDBIND | BKS_ROUNDEDTABS | BKS_TABTEXTCENTER | BKS_TABBEDDIALOG;
if (lStyle & wxNB_BOTTOM)
dwTabStyle |= BKS_MAJORTABBOTTOM | BKS_BACKPAGESBL;
);
} // end of wxNotebook::GetRowCount
-int wxNotebook::SetSelection(
- size_t nPage
-)
+int wxNotebook::SetSelection( size_t nPage )
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
return nPage;
} // end of wxNotebook::SetSelection
-bool wxNotebook::SetPageText(
- size_t nPage
-, const wxString& rsStrText
-)
+bool wxNotebook::SetPageText( size_t nPage,
+ const wxString& rsStrText )
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
return (bool)::WinSendMsg( m_hWnd
);
} // end of wxNotebook::SetPageText
-wxString wxNotebook::GetPageText (
- size_t nPage
-) const
+wxString wxNotebook::GetPageText ( size_t nPage ) const
{
BOOKTEXT vBookText;
wxChar zBuf[256];
return wxEmptyString;
}
vBookText.textLen = ulRc + 1; // To get the null terminator
- vBookText.pString = zBuf;
+ vBookText.pString = (char*)zBuf;
//
// Now get the actual text
ulRc = 255L;
vBookText.pString[ulRc] = '\0';
- sStr = vBookText.pString;
+ sStr = (wxChar*)vBookText.pString;
return sStr;
} // end of wxNotebook::GetPageText
-int wxNotebook::GetPageImage (
- size_t nPage
-) const
+int wxNotebook::GetPageImage ( size_t nPage ) const
{
wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
, int nImage
)
{
- wxBitmap* pBitmap = (wxBitmap*)m_imageList->GetBitmap(nImage);
+ wxBitmap vBitmap = (wxBitmap)m_imageList->GetBitmap(nImage);
return (bool)::WinSendMsg( GetHWND()
,BKM_SETTABBITMAP
,MPFROMLONG((ULONG)m_alPageId[nPage])
- ,(MPARAM)pBitmap->GetHBITMAP()
+ ,(MPARAM)vBitmap.GetHBITMAP()
);
} // end of wxNotebook::SetPageImage
wxImageList* pImageList
)
{
- //
+ //
// Does not really do anything yet, but at least we need to
// update the base class.
- //
+ //
wxNotebookBase::SetImageList(pImageList);
} // end of wxNotebook::SetImageList
const wxSize& rSize
)
{
- RECTL vRect;
-
- //
- // Transform the page size into the notebook size
- //
- vRect.xLeft = vRect.yTop = 0;
- vRect.xRight = rSize.x;
- vRect.yBottom = rSize.y;
-
-
- //
- // And now set it
- //
- SetSize( vRect.xRight - vRect.xLeft
- ,vRect.yBottom - vRect.yTop
- );
+ SetSize(rSize);
} // end of wxNotebook::SetPageSize
void wxNotebook::SetPadding (
//
// Remove one page from the notebook, without deleting
//
-wxNotebookPage* wxNotebook::DoRemovePage (
- size_t nPage
-)
+wxNotebookPage* wxNotebook::DoRemovePage ( size_t nPage )
{
- wxNotebookPage* pPageRemoved = wxNotebookBase::DoRemovePage(nPage);
+ wxNotebookPage* pPageRemoved = wxNotebookBase::DoRemovePage(nPage);
if (!pPageRemoved)
return NULL;
,(MPARAM)BKA_ALL
);
m_nSelection = -1;
- return TRUE;
+
+ return true;
} // end of wxNotebook::DeleteAllPages
//
//
// Same as AddPage() but does it at given position
//
-bool wxNotebook::InsertPage (
- size_t nPage
-, wxNotebookPage* pPage
-, const wxString& rsStrText
-, bool bSelect
-, int nImageId
-)
+bool wxNotebook::InsertPage ( size_t nPage,
+ wxNotebookPage* pPage,
+ const wxString& rsStrText,
+ bool bSelect,
+ int nImageId )
{
ULONG ulApiPage;
// Now set TAB dimenstions
//
- wxWindowDC vDC(this);
- wxCoord nTextX;
- wxCoord nTextY;
+ wxWindowDC vDC(this);
+ wxCoord nTextX;
+ wxCoord nTextY;
vDC.GetTextExtent(rsStrText, &nTextX, &nTextY);
nTextY *= 2;
//
// Now set any TAB text
//
- if (!rsStrText.IsEmpty())
+ if (!rsStrText.empty())
{
if (!SetPageText( nPage
,rsStrText
if (nSelNew != -1)
SetSelection(nSelNew);
+
+ InvalidateBestSize();
+
return TRUE;
} // end of wxNotebook::InsertPage
wxSizeEvent& rEvent
)
{
- int nPage;
- int nCount = (int)m_pages.Count();
-
- for (nPage = 0; nPage < nCount; nPage++)
- {
- if (m_nSelection == nPage)
- m_pages[nPage]->Refresh();
- else
- ::WinSetWindowPos(m_pages[nPage]->GetHWND()
- ,NULLHANDLE
- ,0,0,0,0
- ,SWP_HIDE
- );
- }
rEvent.Skip();
} // end of wxNotebook::OnSize
// ----------------------------------------------------------------------------
// wxNotebook Windows message handlers
// ----------------------------------------------------------------------------
-bool wxNotebook::OS2OnScroll (
- int nOrientation
-, WXWORD wSBCode
-, WXWORD wPos
-, WXHWND wControl
-)
+bool wxNotebook::OS2OnScroll ( int nOrientation,
+ WXWORD wSBCode,
+ WXWORD wPos,
+ WXHWND wControl )
{
//
// Don't generate EVT_SCROLLWIN events for the WM_SCROLLs coming from the
} // end of wxNotebook::OS2OnScroll
#endif // wxUSE_NOTEBOOK
-
projects / wxWidgets.git / blobdiff