We surely don't need two debugging sections,

[wxWidgets.git] / include / wx / listbase.h

diff --git a/include/wx/listbase.h b/include/wx/listbase.h
index 6659ab67d6b3cc91bb16131c000709ce5d67123c..d7399039a0f380635679be4259b384463b90d8ae 100644 (file)
--- a/include/wx/listbase.h
+++ b/include/wx/listbase.h
@@ -12,7 +12,7 @@
 #ifndef _WX_LISTBASE_H_BASE_
 #define _WX_LISTBASE_H_BASE_
 
 #ifndef _WX_LISTBASE_H_BASE_
 #define _WX_LISTBASE_H_BASE_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 //    #pragma interface "listctrlbase.h"
 #endif
 
 //    #pragma interface "listctrlbase.h"
 #endif
 


@@ -214,18 +214,29 @@ public:
     void ClearAttributes() { if ( m_attr ) { delete m_attr; m_attr = NULL; } }
 
     // setters
     void ClearAttributes() { if ( m_attr ) { delete m_attr; m_attr = NULL; } }
 
     // setters

-    void SetMask(long mask) { m_mask = mask; }
-    void SetId(long id) { m_itemId = id; }
-    void SetColumn(int col) { m_col = col; }
-    void SetState(long state) { m_state = state; m_stateMask |= state; }
-    void SetStateMask(long stateMask) { m_stateMask = stateMask; }
-    void SetText(const wxString& text) { m_text = text; }
-    void SetImage(int image) { m_image = image; }
-    void SetData(long data) { m_data = data; }
-    void SetData(void *data) { m_data = (long)data; }
-
-    void SetWidth(int width) { m_width = width; }
-    void SetAlign(wxListColumnFormat align) { m_format = align; }
+    void SetMask(long mask)
+        { m_mask = mask; }
+    void SetId(long id)
+        { m_itemId = id; }
+    void SetColumn(int col)
+        { m_col = col; }
+    void SetState(long state)
+        { m_mask |= wxLIST_MASK_STATE; m_state = state; m_stateMask |= state; }
+    void SetStateMask(long stateMask)
+        { m_stateMask = stateMask; }
+    void SetText(const wxString& text)
+        { m_mask |= wxLIST_MASK_TEXT; m_text = text; }
+    void SetImage(int image)
+        { m_mask |= wxLIST_MASK_IMAGE; m_image = image; }
+    void SetData(long data)
+        { m_mask |= wxLIST_MASK_DATA; m_data = data; }
+    void SetData(void *data)
+        { m_mask |= wxLIST_MASK_DATA; m_data = (long)data; }
+
+    void SetWidth(int width)
+        { m_mask |= wxLIST_MASK_WIDTH; m_width = width; }
+    void SetAlign(wxListColumnFormat align)
+        { m_mask |= wxLIST_MASK_FORMAT; m_format = align; }

 
     void SetTextColour(const wxColour& colText)
         { Attributes().SetTextColour(colText); }
 
     void SetTextColour(const wxColour& colText)
         { Attributes().SetTextColour(colText); }