new makefiles (part I)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/generic/helpext.h

@@ -1,12 +1,13 @@
 /*-*- c++ -*-********************************************************
- * exthlp.h - an external help controller for wxWindows             *
+ * helpext.h - an external help controller for wxWindows             *
  *                                                                  *
  * (C) 1998 by Karsten Ball<6C>der (Ballueder@usa.net)                 *
  *                                                                  *
  * $Id$
  *******************************************************************/
-#ifndef WXXHELP_H
-#define WXXHELP_H
+
+#ifndef __WX_HELPEXT_H_
+#define __WX_HELPEXT_H_
 
 #if wxUSE_HELP
 
@@ -46,7 +47,7 @@
    Lines starting with ';' will be ignored.
 */
 
-class wxExtHelpController : public wxHTMLHelpControllerBase
+class WXDLLEXPORT wxExtHelpController : public wxHTMLHelpControllerBase
 {      
 DECLARE_CLASS(wxExtHelpController)
    public:
@@ -76,5 +77,6 @@ DECLARE_CLASS(wxExtHelpController)
    bool DisplayHelp(wxString const &);
 };
 
-#endif  
-#endif
+#endif // wxUSE_HELP
+
+#endif // __WX_HELPEXT_H_

include/wx/generic/helphtml.h

@@ -5,8 +5,9 @@
  *                                                                  *
  * $Id$
  *******************************************************************/
-#ifndef WXXHELPHTML_H
-#define WXXHELPHTML_H
+
+#ifndef __WX_HELPHTML_H_
+#define __WX_HELPHTML_H_
 
 #if wxUSE_HELP
 
@@ -25,7 +26,7 @@
 /// Character introducing comments/documentation field in map file.
 #define WXEXTHELP_COMMENTCHAR   ';'
 
-class wxExtHelpMapList;
+class WXDLLEXPORT wxExtHelpMapList;
 
 
 /**
@@ -47,8 +48,8 @@ class wxExtHelpMapList;
    Lines starting with ';' will be ignored.
 */
 
-class wxHTMLHelpControllerBase : public wxHelpControllerBase
-{      
+class WXDLLEXPORT wxHTMLHelpControllerBase : public wxHelpControllerBase
+{
 DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    public:
    wxHTMLHelpControllerBase(void);
@@ -67,7 +68,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    */
    virtual bool Initialize(const wxString& dir, int WXUNUSED(server))
       { return Initialize(dir); }
-      
+
    /** This must be called to tell the controller where to find the
        documentation.
        If a locale is set, look in file/localename, i.e.
@@ -79,7 +80,7 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
        @return true on success
    */
    virtual bool Initialize(const wxString& dir);
-  
+
    /** If file is "", reloads file given in Initialize.
        @file Name of help directory.
        @return true on success
@@ -124,5 +125,6 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    void DeleteList(void);
 };
 
-#endif  
-#endif
+#endif // wxUSE_HELP
+
+#endif // __WX_HELPHTML_H_

include/wx/generic/laywin.h

@@ -19,17 +19,21 @@
 #pragma interface "laywin.h"
 #endif
 
-#include "wx/sashwin.h"
+#if wxUSE_SASH
+    #include "wx/sashwin.h"
+#endif // wxUSE_SASH
 
 const wxEventType wxEVT_QUERY_LAYOUT_INFO =     wxEVT_FIRST + 1500;
 const wxEventType wxEVT_CALCULATE_LAYOUT =      wxEVT_FIRST + 1501;
 
-enum wxLayoutOrientation {
+enum wxLayoutOrientation
+{
     wxLAYOUT_HORIZONTAL,
     wxLAYOUT_VERTICAL
 };
 
-enum wxLayoutAlignment {
+enum wxLayoutAlignment
+{
     wxLAYOUT_NONE,
     wxLAYOUT_TOP,
     wxLAYOUT_LEFT,
@@ -128,6 +132,8 @@ typedef void (wxEvtHandler::*wxCalculateLayoutEventFunction)(wxCalculateLayoutEv
 
 #define EVT_CALCULATE_LAYOUT(func)  { wxEVT_CALCULATE_LAYOUT, -1, -1, (wxObjectEventFunction) (wxEventFunction) (wxCalculateLayoutEventFunction) & func, NULL },
 
+#if wxUSE_SASH
+
 // This is window that can remember alignment/orientation, does its own layout,
 // and can provide sashes too. Useful for implementing docked windows with sashes in
 // an IDE-style interface.
@@ -163,6 +169,8 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
+#endif // wxUSE_SASH
+
 class WXDLLEXPORT wxMDIParentFrame;
 class WXDLLEXPORT wxFrame;
 

include/wx/generic/sashwin.h

@@ -8,7 +8,7 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_SASHWIN_H_G_
@@ -18,6 +18,8 @@
 #pragma interface "sashwin.h"
 #endif
 
+#if wxUSE_SASH
+
 #include "wx/defs.h"
 #include "wx/window.h"
 #include "wx/string.h"
@@ -210,5 +212,7 @@ typedef void (wxEvtHandler::*wxSashEventFunction)(wxSashEvent&);
 #define EVT_SASH_DRAGGED(id, fn) { wxEVT_SASH_DRAGGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 #define EVT_SASH_DRAGGED_RANGE(id1, id2, fn) { wxEVT_SASH_DRAGGED, id1, id2, (wxObjectEventFunction) (wxEventFunction) (wxSashEventFunction) & fn, NULL },
 
+#endif // wxUSE_SASH
+
 #endif
   // _WX_SASHWIN_H_G_

include/wx/generic/treectrl.h

@@ -323,6 +323,9 @@ public:
         // get the item currently selected (may return NULL if no selection)
     wxTreeItemId GetSelection() const { return m_current; }
 
+        // get the items currently selected, return the number of such item
+  //size_t GetSelections(wxArrayTreeItems*) const;
+
         // get the parent of this item (may return NULL if root)
     wxTreeItemId GetParent(const wxTreeItemId& item) const;
 
@@ -400,8 +403,9 @@ public:
 
         // remove the selection from currently selected item (if any)
     void Unselect();
+    void UnselectAll();
         // select this item
-    void SelectItem(const wxTreeItemId& item);
+    void SelectItem(const wxTreeItemId& item, bool unselect_others=true, bool extended_select=false);
         // make sure this item is visible (expanding the parent item and/or
         // scrolling to this item if necessary)
     void EnsureVisible(const wxTreeItemId& item);
@@ -485,6 +489,11 @@ protected:
     void RefreshSubtree( wxGenericTreeItem *item );
     void RefreshLine( wxGenericTreeItem *item );
 
+    void SelectItemRange( wxGenericTreeItem *item1, wxGenericTreeItem *item2 );
+    bool TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select);
+    bool TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select);
+    void UnselectAllChildren( wxGenericTreeItem *item );
+
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxTreeCtrl)