wxTinderbox build fix (!PCH support).

[wxWidgets.git] / include / wx / mac / carbon / treectrl.h

diff --git a/include/wx/mac/carbon/treectrl.h b/include/wx/mac/carbon/treectrl.h
index 306a0105a57c0456900076eda59ae3687ea5831a..cc41d76a26cd28fde6d87c98dc1c7556b6903880 100644 (file)
--- a/include/wx/mac/carbon/treectrl.h
+++ b/include/wx/mac/carbon/treectrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_TREECTRL_H_
 #define _WX_TREECTRL_H_
 
 #ifndef _WX_TREECTRL_H_
 #define _WX_TREECTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "treectrl.h"
-#endif
-

 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/imaglist.h"
 #include "wx/control.h"
 #include "wx/event.h"
 #include "wx/imaglist.h"


@@ -64,14 +60,6 @@ enum {
     wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
 };
 
     wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
 };
 

-// Flags for ExpandItem
-enum {
-    wxTREE_EXPAND_EXPAND,
-    wxTREE_EXPAND_COLLAPSE,
-    wxTREE_EXPAND_COLLAPSE_RESET,
-    wxTREE_EXPAND_TOGGLE
-};
-

 // Flags for InsertItem
 enum {
     wxTREE_INSERT_LAST = -1,
 // Flags for InsertItem
 enum {
     wxTREE_INSERT_LAST = -1,


@@ -123,11 +111,11 @@ public:
    /*
     * Public interface
     */
    /*
     * Public interface
     */

-    
+

     // creation
     // --------
     wxTreeCtrl();
     // creation
     // --------
     wxTreeCtrl();

-    
+

     inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,
     inline wxTreeCtrl(wxWindow *parent, wxWindowID id = -1,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize,


@@ -138,14 +126,14 @@ public:
         Create(parent, id, pos, size, style, validator, name);
     }
     ~wxTreeCtrl();
         Create(parent, id, pos, size, style, validator, name);
     }
     ~wxTreeCtrl();

-    
-    bool Create(wxWindow *parent, wxWindowID id = -1,
+
+    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,

                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = "wxTreeCtrl");
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = "wxTreeCtrl");

-    
+

     // accessors
     // ---------
       //
     // accessors
     // ---------
       //


@@ -183,17 +171,17 @@ public:
     long GetItemData(long item) const;
     bool SetItemData(long item, long data);
       // convenience function
     long GetItemData(long item) const;
     bool SetItemData(long item, long data);
       // convenience function

-    bool IsItemExpanded(long item) 
-    { 
-      return (GetItemState(item, wxTREE_STATE_EXPANDED) & 
+    bool IsItemExpanded(long item)
+    {
+      return (GetItemState(item, wxTREE_STATE_EXPANDED) &

                            wxTREE_STATE_EXPANDED) != 0;
     }
 
       // bounding rect
                            wxTREE_STATE_EXPANDED) != 0;
     }
 
       // bounding rect

-    bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const;
+    bool GetItemRect(long item, wxRect& rect, bool textOnly = false) const;

       //
     wxTextCtrl* GetEditControl() const;
       //
     wxTextCtrl* GetEditControl() const;

-    
+

     // operations
     // ----------
       // adding/deleting items
     // operations
     // ----------
       // adding/deleting items


@@ -203,7 +191,7 @@ public:
       // If image > -1 and selImage == -1, the same image is used for
       // both selected and unselected items.
     long InsertItem(long parent, const wxString& label,
       // If image > -1 and selImage == -1, the same image is used for
       // both selected and unselected items.
     long InsertItem(long parent, const wxString& label,

-                    int image = -1, int selImage = -1, 
+                    int image = -1, int selImage = -1,

                     long insertAfter = wxTREE_INSERT_LAST);
 
       // changing item state
                     long insertAfter = wxTREE_INSERT_LAST);
 
       // changing item state


@@ -212,8 +200,8 @@ public:
     bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
       // common interface for {Expand|Collapse|Toggle}Item
     bool ExpandItem(long item, int action);
     bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
       // common interface for {Expand|Collapse|Toggle}Item
     bool ExpandItem(long item, int action);

-    
-      // 
+
+      //

     bool SelectItem(long item);
     bool ScrollTo(long item);
     bool DeleteAllItems();
     bool SelectItem(long item);
     bool ScrollTo(long item);
     bool DeleteAllItems();


@@ -228,7 +216,7 @@ public:
     //  wxImageList *CreateDragImage(long item);
     bool SortChildren(long item);
     bool EnsureVisible(long item);
     //  wxImageList *CreateDragImage(long item);
     bool SortChildren(long item);
     bool EnsureVisible(long item);

-    
+

     void Command(wxCommandEvent& event) { ProcessCommand(event); };
 
 protected:
     void Command(wxCommandEvent& event) { ProcessCommand(event); };
 
 protected: