Removed duplicate xh_grid.cpp/h and rebaked files

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

diff --git a/include/wx/mac/carbon/listctrl.h b/include/wx/mac/carbon/listctrl.h
index 4975c279c83088ce44b2c6a84b13724b2b345ab5..82defacf72b8b2bf39ba1c54b5c7f856f54618f5 100644 (file)
--- a/include/wx/mac/carbon/listctrl.h
+++ b/include/wx/mac/carbon/listctrl.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 
 #ifndef _WX_LISTCTRL_H_
 #define _WX_LISTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "listctrl.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"


@@ -176,14 +172,14 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,
 
   inline wxListCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator,

-            const wxString& name = "listCtrl")
+            const wxString& name = wxListCtrlNameStr)

   {
     Create(parent, id, pos, size, style, validator, name);
   }
   ~wxListCtrl();
 
   bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
   {
     Create(parent, id, pos, size, style, validator, name);
   }
   ~wxListCtrl();
 
   bool Create(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,

-            long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListCtrl");
+            long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListCtrlNameStr);

 
 
   // Attributes
 
 
   // Attributes


@@ -256,7 +252,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   int GetColumnCount() const;
 
   // Retrieves the spacing between icons in pixels.
   int GetColumnCount() const;
 
   // Retrieves the spacing between icons in pixels.

-  // If small is TRUE, gets the spacing for the small icon
+  // If isSmall is true, gets the spacing for the small icon

   // view, otherwise the large icon view.
   int GetItemSpacing(bool isSmall) const;
 
   // view, otherwise the large icon view.
   int GetItemSpacing(bool isSmall) const;
 


@@ -274,7 +270,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   long GetTopItem() const ;
 
   // Add or remove a single window style
   long GetTopItem() const ;
 
   // Add or remove a single window style

-  void SetSingleStyle(long style, bool add = TRUE) ;
+  void SetSingleStyle(long style, bool add = true) ;

 
   // Set the whole window style
   void SetWindowStyleFlag(long style) ;
 
   // Set the whole window style
   void SetWindowStyleFlag(long style) ;


@@ -335,7 +331,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
 
   // Find an item whose label matches this string, starting from the item after 'start'
   // or the beginning if 'start' is -1.
 
   // Find an item whose label matches this string, starting from the item after 'start'
   // or the beginning if 'start' is -1.

-  long FindItem(long start, const wxString& str, bool partial = FALSE);
+  long FindItem(long start, const wxString& str, bool partial = false);

 
   // Find an item whose data matches this data, starting from the item after 'start'
   // or the beginning if 'start' is -1.
 
   // Find an item whose data matches this data, starting from the item after 'start'
   // or the beginning if 'start' is -1.