X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4fa688d8bced718a7ef35d4ebd3c4db6eb2afa7d..4e4ea166d76da40eaa5fdcf9e958d93521f72fba:/src/msw/notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index 34e0b589af..8eb91dbc34 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -134,10 +134,15 @@ bool wxNotebook::Create(wxWindow *parent,
   m_windowStyle = style | wxTAB_TRAVERSAL;
 
   long tabStyle = WS_CHILD | WS_VISIBLE | WS_TABSTOP | TCS_TABS;
+
+  if (m_windowStyle & wxCLIP_CHILDREN)
+    tabStyle |= WS_CLIPCHILDREN;
   if ( m_windowStyle & wxTC_MULTILINE )
     tabStyle |= TCS_MULTILINE;
   if ( m_windowStyle & wxBORDER )
     tabStyle &= WS_BORDER;
+  if (m_windowStyle & wxNB_FIXEDWIDTH)
+    tabStyle |= TCS_FIXEDWIDTH ;
 
   // create the tab control.
   m_hWnd = (WXHWND)CreateWindowEx
@@ -332,9 +337,23 @@ bool wxNotebook::InsertPage(int nPage,
 
   // add the tab to the control
   TC_ITEM tcItem;
-  tcItem.mask    = TCIF_TEXT | TCIF_IMAGE;
-  tcItem.pszText = (char *)strText.c_str();
-  tcItem.iImage  = imageId;
+  tcItem.mask    = 0;
+
+  if (imageId != -1)
+  {
+    tcItem.mask |= TCIF_IMAGE;
+    tcItem.iImage  = imageId;
+  }
+  else
+    tcItem.iImage  = 0;
+
+  if (!strText.IsEmpty())
+  {
+    tcItem.mask    |= TCIF_TEXT;
+    tcItem.pszText = (char *)strText.c_str();
+  }
+  else
+    tcItem.pszText = (char *) NULL;
 
   if ( TabCtrl_InsertItem(m_hwnd, nPage, &tcItem) == -1 ) {
     wxLogError("Can't create the notebook page '%s'.", strText.c_str());
@@ -445,7 +464,7 @@ void wxNotebook::Command(wxCommandEvent& event)
   wxFAIL_MSG("wxNotebook::Command not implemented");
 }
 
-bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
+bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
 {
   wxNotebookEvent event(wxEVT_NULL, m_windowId);
 
@@ -460,13 +479,13 @@ bool wxNotebook::MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM* result)
       break;
 
     default:
-      return wxControl::MSWNotify(wParam, lParam, result);
+      return wxControl::MSWOnNotify(idCtrl, lParam, result);
   }
 
   event.SetSelection(TabCtrl_GetCurSel(m_hwnd));
   event.SetOldSelection(m_nSelection);
   event.SetEventObject(this);
-  event.SetInt(LOWORD(wParam)); // ctrl id
+  event.SetInt(idCtrl);
 
   bool processed = GetEventHandler()->ProcessEvent(event);
   *result = !event.IsAllowed();
@@ -525,3 +544,10 @@ void wxNotebook::OnEraseBackground(wxEraseEvent& event)
     Default();
 }
 
+// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
+// style.
+void wxNotebook::SetTabSize(const wxSize& sz)
+{
+    ::SendMessage((HWND) GetHWND(), TCM_SETITEMSIZE, 0, MAKELPARAM(sz.x, sz.y));
+}
+