wxFD_* constants without 2.6 compatibility (heavily extended and modified patch ...

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

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index c2553f2f2fe4c70ca26fab3695a1c51c9e789957..a218e6d92300636c4e610e3d50a8a9f97cac4792 100644 (file)
--- a/src/msw/tabctrl.cpp
+++ b/src/msw/tabctrl.cpp
@@ -1,47 +1,34 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        tabctrl.cpp
+// Name:        src/msw/tabctrl.cpp

 // Purpose:     wxTabCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxTabCtrl
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx/wx.h"
-#endif
+#if wxUSE_TAB_DIALOG

 
 

-#if defined(__WIN95__)
-
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
-#include "malloc.h"
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+    #include "wx/app.h"

 #endif
 
 #endif
 

-#include <windows.h>
+#include "wx/msw/private.h"

 
 

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

 
 

-#include "wx/msw/dib.h"

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

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

 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)
 #include "wx/msw/imaglist.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxTabCtrl, wxControl)


@@ -90,7 +77,7 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
 
   m_windowId = (id < 0 ? NewControlId() : id);
 
 
   m_windowId = (id < 0 ? NewControlId() : id);
 

-  long tabStyle = 0;
+  long tabStyle = WS_CHILD | WS_VISIBLE;

   if (m_windowStyle & wxTC_MULTILINE)
     tabStyle |= TCS_MULTILINE;
   if (m_windowStyle & wxTC_RIGHTJUSTIFY)
   if (m_windowStyle & wxTC_MULTILINE)
     tabStyle |= TCS_MULTILINE;
   if (m_windowStyle & wxTC_RIGHTJUSTIFY)


@@ -102,12 +89,14 @@ bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, cons
   if (m_windowStyle & wxBORDER)
     tabStyle |= WS_BORDER;
 
   if (m_windowStyle & wxBORDER)
     tabStyle |= WS_BORDER;
 

+#ifndef __WXWINCE__

   tabStyle |= TCS_TOOLTIPS;
   tabStyle |= TCS_TOOLTIPS;

+#endif

 
   // Create the toolbar control.
   HWND hWndTabCtrl = CreateWindowEx(0L,     // No extended styles.
     WC_TABCONTROL,                          // Class name for the tab control
 
   // 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
     tabStyle,    // Styles and defaults.
     x, y, width, height,                    // Standard size and position.
     (HWND) parent->GetHWND(),               // Parent window


@@ -117,12 +106,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()


@@ -133,7 +122,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,13 +134,14 @@ bool wxTabCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
             break;
 
             eventType = wxEVT_COMMAND_TAB_SEL_CHANGING;
             break;
 

+#ifndef __WXWINCE__

         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;
         }
 //                ttText->lpszText = (char *) (const char *)tool->m_shortHelpString;
         }

-
+#endif

         default :
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }
         default :
             return wxControl::MSWOnNotify(idCtrl, lParam, result);
     }


@@ -218,13 +208,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;

     }
 }
 
     }
 }
 


@@ -238,7 +228,7 @@ int wxTabCtrl::GetRowCount() const
 wxString wxTabCtrl::GetItemText(int item) const
 {
     wxChar buf[256];
 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;
     TC_ITEM tcItem;
     tcItem.mask = TCIF_TEXT;
     tcItem.pszText = buf;


@@ -300,7 +290,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 != wxT(""))
+    if (!text.empty())

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


@@ -326,7 +316,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


@@ -441,5 +431,4 @@ void wxMapBitmap(HBITMAP hBitmap, int width, int height)
 }
 #endif
 
 }
 #endif
 

-#endif
-    // __WIN95__
+#endif // wxUSE_TAB_DIALOG