///////////////////////////////////////////////////////////////////////////////
-// Name: notebook.cpp
+// Name: src/os2/notebook.cpp
// Purpose: implementation of wxNotebook
// Author: David Webster
// Modified by:
#if wxUSE_NOTEBOOK
-// wxWindows
+#include "wx/notebook.h"
+
+// wxWidgets
#ifndef WX_PRECOMP
- #include "wx/app.h"
- #include "wx/string.h"
- #include "wx/settings.h"
+ #include "wx/app.h"
+ #include "wx/dcclient.h"
+ #include "wx/string.h"
+ #include "wx/settings.h"
+ #include "wx/log.h"
+ #include "wx/event.h"
+ #include "wx/control.h"
#endif // WX_PRECOMP
-#include "wx/log.h"
#include "wx/imaglist.h"
-#include "wx/event.h"
-#include "wx/control.h"
-#include "wx/notebook.h"
#include "wx/os2/private.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()
DEFINE_EVENT_TYPE(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)
BEGIN_EVENT_TABLE(wxNotebook, wxControl)
- EVT_NOTEBOOK_PAGE_CHANGED(-1, wxNotebook::OnSelChange)
+ EVT_NOTEBOOK_PAGE_CHANGED(wxID_ANY, wxNotebook::OnSelChange)
EVT_SIZE(wxNotebook::OnSize)
EVT_SET_FOCUS(wxNotebook::OnSetFocus)
EVT_NAVIGATION_KEY(wxNotebook::OnNavigationKey)
//
// 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 )
{
+ if ( (lStyle & wxBK_ALIGN_MASK) == wxBK_DEFAULT )
+ lStyle |= wxBK_TOP;
//
// 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)
+ if (lStyle & wxBK_BOTTOM)
dwTabStyle |= BKS_MAJORTABBOTTOM | BKS_BACKPAGESBL;
- else if (lStyle & wxNB_RIGHT)
+ else if (lStyle & wxBK_RIGHT)
dwTabStyle |= BKS_MAJORTABRIGHT | BKS_BACKPAGESBR;
- else if (lStyle & wxNB_LEFT)
+ else if (lStyle & wxBK_LEFT)
dwTabStyle |= BKS_MAJORTABLEFT | BKS_BACKPAGESTL;
else // default to top
dwTabStyle |= BKS_MAJORTABTOP | BKS_BACKPAGESTR;
// wxNotebook accessors
// ----------------------------------------------------------------------------
-int wxNotebook::GetPageCount() const
+size_t wxNotebook::GetPageCount() const
{
- int nPageInternal = m_pages.Count();
- int nPageAPI = (int)::WinSendMsg(GetHWND(), BKM_QUERYPAGECOUNT, (MPARAM)0, (MPARAM)BKA_END);
-
//
// Consistency check
//
);
} // end of wxNotebook::GetRowCount
-int wxNotebook::SetSelection(
- int nPage
-)
+int wxNotebook::SetSelection( size_t nPage )
{
- wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
- if (nPage != m_nSelection)
+ if (nPage != (size_t)m_nSelection)
{
wxNotebookEvent vEvent( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
,m_windowId
vEvent.SetEventType(wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED);
GetEventHandler()->ProcessEvent(vEvent);
- ULONG ulPageId = (ULONG)m_alPageId[nPage];
-
::WinSendMsg( GetHWND()
,BKM_TURNTOPAGE
,MPFROMLONG((ULONG)m_alPageId[nPage])
return nPage;
} // end of wxNotebook::SetSelection
-bool wxNotebook::SetPageText(
- int nPage
-, const wxString& rsStrText
-)
+int wxNotebook::ChangeSelection( size_t nPage )
{
- wxCHECK_MSG( IS_VALID_PAGE(nPage), FALSE, wxT("notebook page out of range") );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
+ if (nPage != (size_t)m_nSelection)
+ {
+ ::WinSendMsg( GetHWND()
+ ,BKM_TURNTOPAGE
+ ,MPFROMLONG((ULONG)m_alPageId[nPage])
+ ,(MPARAM)0
+ );
+ }
+ m_nSelection = nPage;
+ return nPage;
+}
- ULONG ulPageId = (ULONG)m_alPageId[nPage];
-
+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
,BKM_SETTABTEXT
,MPFROMLONG((ULONG)m_alPageId[nPage])
);
} // end of wxNotebook::SetPageText
-wxString wxNotebook::GetPageText (
- int nPage
-) const
+wxString wxNotebook::GetPageText ( size_t nPage ) const
{
BOOKTEXT vBookText;
wxChar zBuf[256];
wxString sStr;
ULONG ulRc;
- wxCHECK_MSG( IS_VALID_PAGE(nPage), wxT(""), wxT("notebook page out of range") );
-
-
- ULONG ulPageId = (ULONG)m_alPageId[nPage];
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), wxEmptyString, wxT("notebook page out of range") );
memset(&vBookText, '\0', sizeof(BOOKTEXT));
vBookText.textLen = 0; // This will get the length
,MPFROMLONG((ULONG)m_alPageId[nPage])
,MPFROMP(&vBookText)
));
- if (ulRc == BOOKERR_INVALID_PARAMETERS || ulRc == 0L)
+ if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS || ulRc == 0L)
{
- if (ulRc == BOOKERR_INVALID_PARAMETERS)
+ if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS)
{
wxLogError(wxT("Invalid Page Id for page text querry."));
}
return wxEmptyString;
}
vBookText.textLen = ulRc + 1; // To get the null terminator
- vBookText.pString = zBuf;
+ vBookText.pString = (char*)zBuf;
//
// Now get the actual text
,MPFROMLONG((ULONG)m_alPageId[nPage])
,MPFROMP(&vBookText)
));
- if (ulRc == BOOKERR_INVALID_PARAMETERS || ulRc == 0L)
+ if (ulRc == (ULONG)BOOKERR_INVALID_PARAMETERS || ulRc == 0L)
{
return wxEmptyString;
}
ulRc = 255L;
vBookText.pString[ulRc] = '\0';
- sStr = vBookText.pString;
+ sStr = (wxChar*)vBookText.pString;
return sStr;
} // end of wxNotebook::GetPageText
-int wxNotebook::GetPageImage (
- int nPage
-) const
+int wxNotebook::GetPageImage ( size_t nPage ) const
{
- wxCHECK_MSG( IS_VALID_PAGE(nPage), -1, wxT("notebook page out of range") );
+ wxCHECK_MSG( IS_VALID_PAGE(nPage), wxNOT_FOUND, wxT("notebook page out of range") );
//
// For OS/2 just return the page
} // end of wxNotebook::GetPageImage
bool wxNotebook::SetPageImage (
- int nPage
+ size_t nPage
, int nImage
)
{
- wxBitmap* pBitmap = (wxBitmap*)m_imageList->GetBitmap(nImage);
-
-
- ULONG ulPageId = (ULONG)m_alPageId[nPage];
+ wxBitmap vBitmap = (wxBitmap)m_imageList->GetBitmap(nImage);
return (bool)::WinSendMsg( GetHWND()
,BKM_SETTABBITMAP
,MPFROMLONG((ULONG)m_alPageId[nPage])
- ,(MPARAM)pBitmap->GetHBITMAP()
+ ,(MPARAM)wxFlipBmp(vBitmap.GetHBITMAP())
);
} // end of wxNotebook::SetPageImage
void wxNotebook::SetImageList (
- wxImageList* WXUNUSED(pImageList)
+ wxImageList* pImageList
)
{
//
- // Does nothing under OS/2
+ // 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 (
- int nPage
-)
+wxNotebookPage* wxNotebook::DoRemovePage ( size_t nPage )
{
- wxNotebookPage* pPageRemoved = wxNotebookBase::DoRemovePage(nPage);
+ wxNotebookPage* pPageRemoved = wxNotebookBase::DoRemovePage(nPage);
if (!pPageRemoved)
return NULL;
-
- ULONG ulPageId = (ULONG)m_alPageId[nPage];
-
::WinSendMsg( GetHWND()
,BKM_DELETEPAGE
,MPFROMLONG((ULONG)m_alPageId[nPage])
//
int nSelNew;
- if (m_nSelection == GetPageCount())
+ if (m_nSelection == (int)GetPageCount())
{
//
// Last page deleted, make the new last page the new selection
//
nSelNew = m_nSelection - 1;
}
- else if (nPage <= m_nSelection)
+ else if (nPage <= (size_t)m_nSelection)
{
//
// We must show another page, even if it has the same index
,(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 (
- int 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;
wxASSERT( pPage != NULL );
- wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), FALSE );
+ wxCHECK( IS_VALID_PAGE(nPage) || nPage == GetPageCount(), false );
//
// Under OS/2 we can only insert FIRST, LAST, NEXT or PREV. Requires
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- return FALSE;
+ return false;
}
m_alPageId.Insert((long)ulApiPage, nPage);
}
vError = ::WinGetLastError(vHabmain);
sError = wxPMErrorToStr(vError);
- return FALSE;
+ return false;
}
m_alPageId.Insert((long)ulApiPage, nPage);
}
,MPFROMLONG((ULONG)m_alPageId[nPage])
,MPFROMHWND(pPage->GetHWND())
))
- return FALSE;
+ return false;
}
//
// If the inserted page is before the selected one, we must update the
// index of the selected page
//
- if (nPage <= m_nSelection)
+ if (nPage <= (size_t)m_nSelection)
{
//
// One extra page added
// 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;
- nTextX *= 1.3;
+ nTextX = (wxCoord)(nTextX * 1.3);
if (nTextX > m_nTabSize)
{
m_nTabSize = nTextX;
//
// Now set any TAB text
//
- if (!rsStrText.IsEmpty())
+ if (!rsStrText.empty())
{
if (!SetPageText( nPage
,rsStrText
))
- return FALSE;
+ return false;
}
//
if (!SetPageImage( nPage
,nImageId
))
- return FALSE;
+ return false;
}
if (pPage)
//
// Don't show pages by default (we'll need to adjust their size first)
//
- HWND hWnd = GetWinHwnd(pPage);
+ HWND hWnd = GetWinHwnd(pPage);
WinSetWindowULong( hWnd
,QWL_STYLE
//
// This updates internal flag too - otherwise it will get out of sync
//
- pPage->Show(FALSE);
+ pPage->Show(false);
}
//
// Some page should be selected: either this one or the first one if there is
// still no selection
//
- int nSelNew = -1;
+ int nSelNew = -1;
if (bSelect)
nSelNew = nPage;
if (nSelNew != -1)
SetSelection(nSelNew);
- return TRUE;
+
+ 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
//
if (rEvent.GetEventObject() == this)
{
- int nPageCount = GetPageCount();
- int nSel;
- ULONG ulOS2Sel = (ULONG)rEvent.GetOldSelection();
- bool bFound = FALSE;
+ int nPageCount = GetPageCount();
+ int nSel;
+ ULONG ulOS2Sel = (ULONG)rEvent.GetOldSelection();
+ bool bFound = false;
for (nSel = 0; nSel < nPageCount; nSel++)
{
- if (ulOS2Sel == m_alPageId[nSel])
+ if (ulOS2Sel == (ULONG)m_alPageId[nSel])
{
- bFound = TRUE;
+ bFound = true;
break;
}
}
if (!bFound)
return;
- m_pages[nSel]->Show(FALSE);
+ m_pages[nSel]->Show(false);
ulOS2Sel = (ULONG)rEvent.GetSelection();
- bFound = FALSE;
+ bFound = false;
for (nSel = 0; nSel < nPageCount; nSel++)
{
- if (ulOS2Sel == m_alPageId[nSel])
+ if (ulOS2Sel == (ULONG)m_alPageId[nSel])
{
- bFound = TRUE;
+ bFound = true;
break;
}
}
wxNotebookPage* pPage = m_pages[nSel];
- pPage->Show(TRUE);
+ pPage->Show(true);
m_nSelection = nSel;
}
//
// Override these 2 functions to do nothing: everything is done in OnSize
//
-void wxNotebook::SetConstraintSizes(
- bool WXUNUSED(bRecurse)
-)
+void wxNotebook::SetConstraintSizes( bool WXUNUSED(bRecurse) )
{
//
// Don't set the sizes of the pages - their correct size is not yet known
//
- wxControl::SetConstraintSizes(FALSE);
+ wxControl::SetConstraintSizes(false);
} // end of wxNotebook::SetConstraintSizes
-bool wxNotebook::DoPhase (
- int WXUNUSED(nPhase)
-)
+bool wxNotebook::DoPhase ( int WXUNUSED(nPhase) )
{
- return TRUE;
+ return true;
} // end of wxNotebook::DoPhase
// ----------------------------------------------------------------------------
// 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
// up-down control
//
if (wControl)
- return FALSE;
+ return false;
return wxNotebookBase::OS2OnScroll( nOrientation
,wSBCode
,wPos
} // end of wxNotebook::OS2OnScroll
#endif // wxUSE_NOTEBOOK
-
projects / wxWidgets.git / blobdiff