long long for DJGPP

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

diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index 1d91001888d07243c0dc0ac8a429c7c9766f6459..fcc8c30811eecca66ea2eb6baad310410cf27b6b 100644 (file)
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -110,32 +110,25 @@ enum wxTreeItemIcon
     wxTreeItemIcon_Max
 };
 
     wxTreeItemIcon_Max
 };
 

-enum wxButtonImage              // effectively the same as wxTreeItemIcon
-{
-    wxCLOSED_BUTTON = 0,                // closed, not selected
-    wxCLOSED_BUTTON_SELECTED,           // closed,     selected
-    wxOPEN_BUTTON,                      // open,   not selected
-    wxOPEN_BUTTON_SELECTED              // open,       selected
-};
-

 /*
  * wxTreeCtrl flags
  */
 // TODO: maybe renumber these?
 #define wxTR_NO_BUTTONS      0x0000     // for convenience
 /*
  * wxTreeCtrl flags
  */
 // TODO: maybe renumber these?
 #define wxTR_NO_BUTTONS      0x0000     // for convenience

-#define wxTR_HAS_BUTTONS     0x0004     // generates a +/- button
-#define wxTR_TWIST_BUTTONS   0x0008     // twister buttons
-#define wxTR_NO_LINES        0x0100     // don't generate level connectors
+#define wxTR_HAS_BUTTONS     0x0001     // generates a +/- button
+#define wxTR_TWIST_BUTTONS   0x0002     // generates a twister button
+#define wxTR_NO_LINES        0x0004     // don't generate level connectors
+#define wxTR_LINES_AT_ROOT   0x0008     // connect top-level nodes

 #define wxTR_MAC_BUTTONS     wxTR_TWIST_BUTTONS  // backward compatibility
 #define wxTR_MAC_BUTTONS     wxTR_TWIST_BUTTONS  // backward compatibility

+#define wxTR_AQUA_BUTTONS    0x0010     // used internally

 
 #define wxTR_SINGLE          0x0000     // for convenience
 #define wxTR_MULTIPLE        0x0020     // can select multiple items
 #define wxTR_EXTENDED        0x0040     // TODO: allow extended selection
 
 #define wxTR_EDIT_LABELS     0x0200     // can edit item labels
 
 #define wxTR_SINGLE          0x0000     // for convenience
 #define wxTR_MULTIPLE        0x0020     // can select multiple items
 #define wxTR_EXTENDED        0x0040     // TODO: allow extended selection
 
 #define wxTR_EDIT_LABELS     0x0200     // can edit item labels

-#define wxTR_LINES_AT_ROOT   0x0010     // specific to wxMSW
-#define wxTR_HIDE_ROOT       0x0800     // don't display root node

 #define wxTR_ROW_LINES       0x0400     // put border around items
 #define wxTR_ROW_LINES       0x0400     // put border around items

+#define wxTR_HIDE_ROOT       0x0800     // don't display root node

 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 // what it says
 
 // TODO: different default styles for wxGTK, wxMotif, whatever?
 #define wxTR_HAS_VARIABLE_ROW_HEIGHT 0x0080 // what it says
 
 // TODO: different default styles for wxGTK, wxMotif, whatever?


@@ -222,9 +215,6 @@ private:
 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {
 
 class WXDLLEXPORT wxTreeEvent : public wxNotifyEvent
 {

-    friend class WXDLLEXPORT wxTreeCtrl;
-    friend class WXDLLEXPORT wxGenericTreeCtrl;
-

 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 
 public:
     wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
 


@@ -241,19 +231,25 @@ public:
         // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position
     wxPoint GetPoint() const { return m_pointDrag; }
 
         // wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position
     wxPoint GetPoint() const { return m_pointDrag; }
 

-        // keyboard code (for wxEVT_COMMAND_TREE_KEY_DOWN only)
-    int GetCode() const { return m_code; }
+        // keyboard data (for wxEVT_COMMAND_TREE_KEY_DOWN only)
+    const wxKeyEvent& GetKeyEvent() const { return m_evtKey; }
+    int GetCode() const { return m_evtKey.GetKeyCode(); }

 
         // label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
     const wxString& GetLabel() const { return m_label; }
 
 private:
 
         // label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
     const wxString& GetLabel() const { return m_label; }
 
 private:

-    // we could probably save some space by using union here
-    int           m_code;
+    // not all of the members are used (or initialized) for all events
+    wxKeyEvent    m_evtKey;

     wxTreeItemId  m_item,
                   m_itemOld;
     wxPoint       m_pointDrag;
     wxString      m_label;
     wxTreeItemId  m_item,
                   m_itemOld;
     wxPoint       m_pointDrag;
     wxString      m_label;

+
+    friend class WXDLLEXPORT wxTreeCtrl;
+    friend class WXDLLEXPORT wxGenericTreeCtrl;
+
+    DECLARE_DYNAMIC_CLASS(wxTreeEvent);

 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 };
 
 typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);