minor reformat

[wxWidgets.git] / src / mac / carbon / tabctrl.cpp

diff --git a/src/mac/carbon/tabctrl.cpp b/src/mac/carbon/tabctrl.cpp
index 33bf35469b5fe3e52a76671ec7fbd1ce0f1f24e9..fdce08e0ee0e162314fbf25c11203fea327143c6 100644 (file)
--- a/src/mac/carbon/tabctrl.cpp
+++ b/src/mac/carbon/tabctrl.cpp
@@ -9,11 +9,7 @@
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:       wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "tabctrl.h"
-#endif
-
-#include "wx/defs.h"
+#include "wx/wxprec.h"

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


@@ -29,43 +25,46 @@ DEFINE_EVENT_TYPE(wxEVT_COMMAND_TAB_SEL_CHANGING)
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxTabCtrl, wxControl)
 END_EVENT_TABLE()
 

+

 wxTabCtrl::wxTabCtrl()
 {
 wxTabCtrl::wxTabCtrl()
 {

+    m_macIsUserPane = false;

     m_imageList = NULL;
 }
 
     m_imageList = NULL;
 }
 

-bool wxTabCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name)
+bool wxTabCtrl::Create( wxWindow *parent,
+    wxWindowID id, const wxPoint& pos, const wxSize& size,
+    long style, const wxString& name )

 {
 {

-    m_macIsUserPane = FALSE ;
-    
-    if ( !wxControl::Create(parent, id, pos, size,
-                            style, wxDefaultValidator, name) )
+    m_macIsUserPane = false;
+    m_imageList = NULL;
+
+    if ( !wxControl::Create( parent, id, pos, size, style, wxDefaultValidator, name ) )

         return false;
 
         return false;
 

-    m_imageList = NULL;
-    
-    Rect bounds = wxMacGetBoundsForControl( this , pos , size ) ;
+    Rect bounds = wxMacGetBoundsForControl( this, pos, size );

 
 

-    UInt16 tabstyle = kControlTabDirectionNorth ;
-    ControlTabSize tabsize = kControlTabSizeLarge ;
+    UInt16 tabstyle = kControlTabDirectionNorth;
+    ControlTabSize tabsize = kControlTabSizeLarge;

     if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
         tabsize = kControlTabSizeSmall ;
     else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
     {
         if (UMAGetSystemVersion() >= 0x1030 )
     if ( GetWindowVariant() == wxWINDOW_VARIANT_SMALL )
         tabsize = kControlTabSizeSmall ;
     else if ( GetWindowVariant() == wxWINDOW_VARIANT_MINI )
     {
         if (UMAGetSystemVersion() >= 0x1030 )

-            tabsize = 3 ; 
+            tabsize = 3 ;

         else
         else

-            tabsize = kControlSizeSmall; 
+            tabsize = kControlSizeSmall;

     }
     }

-    
-    m_peer = new wxMacControl() ;
-    verify_noerr ( CreateTabsControl( MAC_WXHWND(parent->MacGetTopLevelWindowRef()) , &bounds ,
-     tabsize , tabstyle, 0, NULL,  m_peer->GetControlRefAddr() ) );
-    

 
 

-    MacPostControlCreate(pos,size) ;
-    return TRUE ;
+    m_peer = new wxMacControl( this );
+    OSStatus err = CreateTabsControl(
+        MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds,
+        tabsize, tabstyle, 0, NULL, m_peer->GetControlRefAddr() );
+    verify_noerr( err );
+
+    MacPostControlCreate( pos, size );
+
+    return true;

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


@@ -76,139 +75,124 @@ void wxTabCtrl::Command(wxCommandEvent& event)
 {
 }
 
 {
 }
 

-// Delete all items

 bool wxTabCtrl::DeleteAllItems()
 {
 bool wxTabCtrl::DeleteAllItems()
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Delete an item

 bool wxTabCtrl::DeleteItem(int item)
 {
 bool wxTabCtrl::DeleteItem(int item)
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Get the selection

 int wxTabCtrl::GetSelection() const
 {
 int wxTabCtrl::GetSelection() const
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
 // Get the tab with the current keyboard focus
     return 0;
 }
 
 // Get the tab with the current keyboard focus

+//

 int wxTabCtrl::GetCurFocus() const
 {
 int wxTabCtrl::GetCurFocus() const
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
     return 0;
 }
 

-// Get the associated image list
-wxImageList* wxTabCtrl::GetImageList() const
+wxImageList * wxTabCtrl::GetImageList() const

 {
     return m_imageList;
 }
 
 {
     return m_imageList;
 }
 

-// Get the number of items

 int wxTabCtrl::GetItemCount() const
 {
 int wxTabCtrl::GetItemCount() const
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
 // Get the rect corresponding to the tab
 bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
 {
     return 0;
 }
 
 // Get the rect corresponding to the tab
 bool wxTabCtrl::GetItemRect(int item, wxRect& wxrect) const
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Get the number of rows

 int wxTabCtrl::GetRowCount() const
 {
 int wxTabCtrl::GetRowCount() const
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
     return 0;
 }
 

-// Get the item text

 wxString wxTabCtrl::GetItemText(int item) const
 {
 wxString wxTabCtrl::GetItemText(int item) const
 {

-    // TODO
+    // TODO:

     return wxEmptyString;
 }
 
     return wxEmptyString;
 }
 

-// Get the item image

 int wxTabCtrl::GetItemImage(int item) const
 {
 int wxTabCtrl::GetItemImage(int item) const
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
     return 0;
 }
 

-// Get the item data

 void* wxTabCtrl::GetItemData(int item) const
 {
 void* wxTabCtrl::GetItemData(int item) const
 {

-    // TODO
+    // TODO:

     return NULL;
 }
 
     return NULL;
 }
 

-// Hit test

 int wxTabCtrl::HitTest(const wxPoint& pt, long& flags)
 {
 int wxTabCtrl::HitTest(const wxPoint& pt, long& flags)
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
     return 0;
 }
 

-// Insert an item

 bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
 {
 bool wxTabCtrl::InsertItem(int item, const wxString& text, int imageId, void* data)
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Set the selection

 int wxTabCtrl::SetSelection(int item)
 {
 int wxTabCtrl::SetSelection(int item)
 {

-    // TODO
+    // TODO:

     return 0;
 }
 
     return 0;
 }
 

-// Set the image list

 void wxTabCtrl::SetImageList(wxImageList* imageList)
 {
 void wxTabCtrl::SetImageList(wxImageList* imageList)
 {

-    // TODO
+    // TODO:

 }
 
 }
 

-// Set the text for an item

 bool wxTabCtrl::SetItemText(int item, const wxString& text)
 {
 bool wxTabCtrl::SetItemText(int item, const wxString& text)
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Set the image for an item

 bool wxTabCtrl::SetItemImage(int item, int image)
 {
 bool wxTabCtrl::SetItemImage(int item, int image)
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 }
 

-// Set the data for an item

 bool wxTabCtrl::SetItemData(int item, void* data)
 {
 bool wxTabCtrl::SetItemData(int item, void* data)
 {

-    // TODO
-    return FALSE;
+    // TODO:
+    return false;

 }
 
 // Set the size for a fixed-width tab control
 void wxTabCtrl::SetItemSize(const wxSize& size)
 {
 }
 
 // Set the size for a fixed-width tab control
 void wxTabCtrl::SetItemSize(const wxSize& size)
 {

-    // TODO
+    // TODO:

 }
 
 // Set the padding between tabs
 void wxTabCtrl::SetPadding(const wxSize& padding)
 {
 }
 
 // Set the padding between tabs
 void wxTabCtrl::SetPadding(const wxSize& padding)
 {

-    // TODO
+    // TODO:

 }
 
 }