Applied patch from Neil Robinson to allow manipulation of unattached menubars

[wxWidgets.git] / src / msw / tabctrl.cpp

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index acbfd871c497441f253c5f064ca0697cbed87351..b2a69f6e77ad7f8909344153e5b0a7e7737071e8 100644 (file)
--- 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:
 // Purpose:     wxTabCtrl
 // Author:      Julian Smart
 // Modified by:


@@ -9,10 +9,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "tabctrl.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -24,15 +20,10 @@
 #include "wx/wx.h"
 #endif
 
 #include "wx/wx.h"
 #endif
 

-#if defined(__WIN95__)
-

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"

 
 #include "wx/tabctrl.h"
 #include "wx/app.h"
 
 #include "wx/tabctrl.h"
 #include "wx/app.h"


@@ -113,12 +104,12 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
   m_hWnd = (WXHWND) hWndTabCtrl;
   if (parent) parent->AddChild(this);
 
   m_hWnd = (WXHWND) hWndTabCtrl;
   if (parent) parent->AddChild(this);

-  
+

   SubclassWin((WXHWND) hWndTabCtrl);
 
   SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 
   SubclassWin((WXHWND) hWndTabCtrl);
 
   SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 

-  return TRUE;
+  return true;

 }
 
 wxTabCtrl::~wxTabCtrl()
 }
 
 wxTabCtrl::~wxTabCtrl()


@@ -129,7 +120,7 @@ wxTabCtrl::~wxTabCtrl()
 bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 {
     wxTabEvent event(wxEVT_NULL, m_windowId);
 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 )
     {
     NMHDR* hdr1 = (NMHDR*) lParam;
     switch ( hdr1->code )
     {


@@ -145,7 +136,7 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case TTN_NEEDTEXT:
         {
             // TODO
         case TTN_NEEDTEXT:
         {
             // TODO

-//            if (tool->m_shortHelpString != "")
+//            if (!tool->m_shortHelpString.empty())

 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }
 #endif
 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }
 #endif


@@ -215,13 +206,13 @@ bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
 {
     RECT rect;
     if ( !TabCtrl_GetItemRect( (HWND) GetHWND(), item, & rect) )
 {
     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;
     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;

     }
 }
 
     }
 }
 


@@ -297,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;
     TC_ITEM tcItem;
     tcItem.mask = TCIF_PARAM;
     tcItem.lParam = (long) data;

-    if (text != wxEmptyString)
+    if (!text.empty())

     {
         tcItem.mask |= TCIF_TEXT;
         wxStrcpy(buf, (const wxChar*) text);
     {
         tcItem.mask |= TCIF_TEXT;
         wxStrcpy(buf, (const wxChar*) text);


@@ -323,7 +314,7 @@ int wxTabCtrl::SetSelection(int item)
 void wxTabCtrl::SetImageList(wxImageList* imageList)
 {
     m_imageList = imageList;
 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
 }
 
 // Set the text for an item


@@ -437,6 +428,3 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 
 }
 #endif
 
 }
 #endif

-
-#endif
-    // __WIN95__