\n"
# creates appearance section: this should be used for all main GUI controls
+# that look different in different ports. genericAppearance can be used for the
+# controls that always look the same.
ALIASES += appearance{1}="\htmlonly
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_BANNERWINDOW_H_
+#define _WX_BANNERWINDOW_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_BANNERWINDOW
+
+#include "wx/bitmap.h"
+#include "wx/event.h"
+#include "wx/window.h"
+
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
+class WXDLLIMPEXP_FWD_CORE wxDC;
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxBannerWindowNameStr[];
+
+// ----------------------------------------------------------------------------
+// A simple banner window showing either a bitmap or text.
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_ADV wxBannerWindow : public wxWindow
+{
+public:
+ // Default constructor, use Create() later.
+ wxBannerWindow() { Init(); }
+
+ // Convenient constructor that should be used in the majority of cases.
+ //
+ // The banner orientation changes how the text in it is displayed and also
+ // defines where is the bitmap truncated if it's too big to fit but doesn't
+ // do anything for the banner position, this is supposed to be taken care
+ // of in the usual way, e.g. using sizers.
+ wxBannerWindow(wxWindow* parent, wxDirection dir = wxLEFT)
+ {
+ Init();
+
+ Create(parent, wxID_ANY, dir);
+ }
+
+ // Full constructor provided for consistency with the other classes only.
+ wxBannerWindow(wxWindow* parent,
+ wxWindowID winid,
+ wxDirection dir = wxLEFT,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxBannerWindowNameStr)
+ {
+ Init();
+
+ Create(parent, winid, dir, pos, size, style, name);
+ }
+
+ // Can be only called on objects created with the default constructor.
+ bool Create(wxWindow* parent,
+ wxWindowID winid,
+ wxDirection dir = wxLEFT,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxBannerWindowNameStr);
+
+
+ // Provide an existing bitmap to show. For wxLEFT orientation the bitmap is
+ // truncated from the top, for wxTOP and wxBOTTOM -- from the right and for
+ // wxRIGHT -- from the bottom, so put the most important part of the bitmap
+ // information in the opposite direction.
+ void SetBitmap(const wxBitmap& bmp);
+
+ // Set the text to display. This is mutually exclusive with SetBitmap().
+ // Title is rendered in bold and should be single line, message can have
+ // multiple lines but is not wrapped automatically.
+ void SetText(const wxString& title, const wxString& message);
+
+ // Set the colours between which the gradient runs. This can be combined
+ // with SetText() but not SetBitmap().
+ void SetGradient(const wxColour& start, const wxColour& end);
+
+protected:
+ virtual wxSize DoGetBestClientSize() const;
+
+private:
+ // Common part of all constructors.
+ void Init();
+
+ // Fully invalidates the window.
+ void OnSize(wxSizeEvent& event);
+
+ // Redraws the window using either m_bitmap or m_title/m_message.
+ void OnPaint(wxPaintEvent& event);
+
+ // Helper of OnPaint(): draw the bitmap at the correct position depending
+ // on our orientation.
+ void DrawBitmapBackground(wxDC& dc);
+
+ // Helper of OnPaint(): draw the text in the appropriate direction.
+ void DrawBannerTextLine(wxDC& dc, const wxString& str, const wxPoint& pos);
+
+ // Return the font to use for the title. Currently this is hardcoded as a
+ // larger bold version of the standard window font but could be made
+ // configurable in the future.
+ wxFont GetTitleFont() const;
+
+
+ // The window side along which the banner is laid out.
+ wxDirection m_direction;
+
+ // If valid, this bitmap is drawn as is.
+ wxBitmap m_bitmap;
+
+ // The title and main message to draw, used if m_bitmap is invalid.
+ wxString m_title,
+ m_message;
+
+ // Start and stop gradient colours, only used when drawing text.
+ wxColour m_colStart,
+ m_colEnd;
+
+ wxDECLARE_EVENT_TABLE();
+
+ wxDECLARE_NO_COPY_CLASS(wxBannerWindow);
+};
+
+#endif // wxUSE_BANNERWINDOW
+
+#endif // _WX_BANNERWINDOW_H_
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 754eabc631..2ba1122fc2 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -256,10 +256,10 @@ protected:
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_XPM
#include "wx/x11/bitmap.h"
#elif defined(__WXMGL__)
- #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_RESOURCE
+ #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE
#include "wx/mgl/bitmap.h"
#elif defined(__WXDFB__)
- #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_RESOURCE
+ #define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_BMP_RESOURCE
#include "wx/dfb/bitmap.h"
#elif defined(__WXMAC__)
#define wxBITMAP_DEFAULT_TYPE wxBITMAP_TYPE_PICT_RESOURCE
diff --git a/include/wx/bookctrl.h b/include/wx/bookctrl.h
index 86a89acfd1..e42d904871 100644
--- a/include/wx/bookctrl.h
+++ b/include/wx/bookctrl.h
@@ -22,6 +22,7 @@
#include "wx/control.h"
#include "wx/dynarray.h"
+#include "wx/withimages.h"
WX_DEFINE_EXPORTED_ARRAY_PTR(wxWindow *, wxArrayPages);
@@ -54,7 +55,8 @@ enum
// wxBookCtrlBase
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl
+class WXDLLIMPEXP_CORE wxBookCtrlBase : public wxControl,
+ public wxWithImages
{
public:
// construction
@@ -85,9 +87,6 @@ public:
long style = 0,
const wxString& name = wxEmptyString);
- // dtor
- virtual ~wxBookCtrlBase();
-
// accessors
// ---------
@@ -117,15 +116,6 @@ public:
// images belong to the same image list)
// ---------------------------------------------------------------------
- // sets the image list to use, it is *not* deleted by the control
- virtual void SetImageList(wxImageList *imageList);
-
- // as SetImageList() but we will delete the image list ourselves
- void AssignImageList(wxImageList *imageList);
-
- // get pointer (may be NULL) to the associated image list
- wxImageList* GetImageList() const { return m_imageList; }
-
// sets/returns item's image index in the current image list
virtual int GetPageImage(size_t n) const = 0;
virtual bool SetPageImage(size_t n, int imageId) = 0;
@@ -191,7 +181,7 @@ public:
virtual bool AddPage(wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = -1)
+ int imageId = NO_IMAGE)
{
DoInvalidateBestSize();
return InsertPage(GetPageCount(), page, text, bSelect, imageId);
@@ -202,7 +192,7 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = -1) = 0;
+ int imageId = NO_IMAGE) = 0;
// set the currently selected page, return the index of the previously
// selected one (or wxNOT_FOUND on error)
@@ -320,12 +310,6 @@ protected:
// the array of all pages of this control
wxArrayPages m_pages;
- // the associated image list or NULL
- wxImageList *m_imageList;
-
- // true if we must delete m_imageList
- bool m_ownsImageList;
-
// get the page area
virtual wxRect GetPageRect() const;
diff --git a/include/wx/cairo.h b/include/wx/cairo.h
index 88d570586b..42cc0d532c 100644
--- a/include/wx/cairo.h
+++ b/include/wx/cairo.h
@@ -16,130 +16,13 @@
#include "wx/dynlib.h"
#include
-
-class wxCairoLibrary
+extern "C"
{
-public:
- // return the pointer to the global instance of this class or NULL if we
- // failed to load/initialize it
- static wxCairoLibrary *Get();
+
+bool wxCairoInit();
+void wxCairoCleanUp();
-
- // for internal use only
- static void CleanUp();
-
-private:
- // the single wxCairoLibrary instance or NULL
- static wxCairoLibrary *ms_lib;
-
- wxCairoLibrary();
- ~wxCairoLibrary();
-
- bool IsOk();
- bool InitializeMethods();
-
- wxDynamicLibrary m_libCairo;
- wxDynamicLibrary m_libPangoCairo;
-
- // true if we successfully loaded the libraries and can use them
- //
- // note that this field must have this name as it's used by wxDL_XXX macros
- bool m_ok;
-
-public:
- wxDL_VOIDMETHOD_DEFINE( cairo_arc,
- (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) )
- wxDL_VOIDMETHOD_DEFINE( cairo_arc_negative,
- (cairo_t *cr, double xc, double yc, double radius, double angle1, double angle2), (cr, xc, yc, radius, angle1, angle2) )
- wxDL_VOIDMETHOD_DEFINE( cairo_clip,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_close_path,
- (cairo_t *cr), (cr) )
- wxDL_METHOD_DEFINE( cairo_t*, cairo_create,
- (cairo_surface_t *target), (target), NULL)
- wxDL_VOIDMETHOD_DEFINE( cairo_curve_to,
- (cairo_t *cr, double x1, double y1, double x2, double y2, double x3, double y3), (cr, x1, y1, x2, y2, x3, y3) )
- wxDL_VOIDMETHOD_DEFINE( cairo_destroy,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_fill,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_fill_preserve,
- (cairo_t *cr), (cr) )
- wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_get_target,
- (cairo_t *cr), (cr), NULL)
- wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_image_surface_create_for_data,
- (unsigned char *data, cairo_format_t format, int width, int height, int stride), (data, format, width, height, stride), NULL)
- wxDL_VOIDMETHOD_DEFINE( cairo_line_to,
- (cairo_t *cr, double x, double y), (cr, x, y) )
- wxDL_VOIDMETHOD_DEFINE( cairo_move_to,
- (cairo_t *cr, double x, double y), (cr, x, y) )
- wxDL_VOIDMETHOD_DEFINE( cairo_new_path,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_paint,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_pattern_add_color_stop_rgba,
- (cairo_pattern_t *pattern, double offset, double red, double green, double blue, double alpha), (pattern, offset, red, green, blue, alpha) )
- wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_for_surface,
- (cairo_surface_t *surface), (surface), NULL)
- wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_linear,
- (double x0, double y0, double x1, double y1), (x0, y0, x1, y1), NULL)
- wxDL_METHOD_DEFINE( cairo_pattern_t*, cairo_pattern_create_radial,
- (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1), (cx0, cy0, radius0, cx1, cy1, radius1), NULL)
- wxDL_VOIDMETHOD_DEFINE( cairo_pattern_destroy,
- (cairo_pattern_t *pattern), (pattern) )
- wxDL_VOIDMETHOD_DEFINE( cairo_pattern_set_extend,
- (cairo_pattern_t *pattern, cairo_extend_t extend), (pattern, extend) )
- wxDL_VOIDMETHOD_DEFINE( cairo_pattern_set_filter,
- (cairo_pattern_t *pattern, cairo_filter_t filter), (pattern, filter) )
- wxDL_VOIDMETHOD_DEFINE( cairo_rectangle,
- (cairo_t *cr, double x, double y, double width, double height), (cr, x, y, width, height) )
- wxDL_METHOD_DEFINE( cairo_t*, cairo_reference,
- (cairo_t *cr), (cr), NULL )
- wxDL_VOIDMETHOD_DEFINE( cairo_reset_clip,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_restore,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_rotate,
- (cairo_t *cr, double angle), (cr, angle) )
- wxDL_VOIDMETHOD_DEFINE( cairo_save,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_scale,
- (cairo_t *cr, double sx, double sy), (cr, sx, sy) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_dash,
- (cairo_t *cr, const double *dashes, int num_dashes, double offset), (cr, dashes, num_dashes, offset) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_fill_rule,
- (cairo_t *cr, cairo_fill_rule_t fill_rule), (cr, fill_rule) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_line_cap,
- (cairo_t *cr, cairo_line_cap_t line_cap), (cr, line_cap) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_line_join,
- (cairo_t *cr, cairo_line_join_t line_join), (cr, line_join) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_line_width,
- (cairo_t *cr, double width), (cr, width) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_operator,
- (cairo_t *cr, cairo_operator_t op), (cr, op) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_source,
- (cairo_t *cr, cairo_pattern_t *source), (cr, source) )
- wxDL_VOIDMETHOD_DEFINE( cairo_set_source_rgba,
- (cairo_t *cr, double red, double green, double blue, double alpha), (cr, red, green, blue, alpha) )
- wxDL_VOIDMETHOD_DEFINE( cairo_stroke,
- (cairo_t *cr), (cr) )
- wxDL_VOIDMETHOD_DEFINE( cairo_stroke_preserve,
- (cairo_t *cr), (cr) )
- wxDL_METHOD_DEFINE( cairo_surface_t*, cairo_surface_create_similar,
- (cairo_surface_t *other, cairo_content_t content, int width, int height), (other, content, width, height), NULL)
- wxDL_VOIDMETHOD_DEFINE( cairo_surface_destroy,
- (cairo_surface_t *surface), (surface) )
- wxDL_VOIDMETHOD_DEFINE( cairo_translate,
- (cairo_t *cr, double tx, double ty), (cr, tx, ty) )
-
-#if wxUSE_PANGO
- wxDL_VOIDMETHOD_DEFINE( pango_cairo_update_layout,
- (cairo_t *cr, PangoLayout *layout), (cr, layout) )
- wxDL_VOIDMETHOD_DEFINE( pango_cairo_show_layout,
- (cairo_t *cr, PangoLayout *layout), (cr, layout) )
-#endif
- wxDECLARE_NO_COPY_CLASS(wxCairoLibrary);
-};
+}
#endif // wxUSE_CAIRO
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 6177aeb5d4..3ecfb6169f 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -41,18 +41,6 @@
*/
#define wxCHK_ALLOW_3RD_STATE_FOR_USER 0x2000
-/*
- * The possible states of a 3-state checkbox (Compatible
- * with the 2-state checkbox).
- */
-enum wxCheckBoxState
-{
- wxCHK_UNCHECKED,
- wxCHK_CHECKED,
- wxCHK_UNDETERMINED /* 3-state checkbox only */
-};
-
-
extern WXDLLIMPEXP_DATA_CORE(const char) wxCheckBoxNameStr[];
// ----------------------------------------------------------------------------
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 4b355fc537..c5fbd78967 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1133,6 +1133,14 @@
# endif
#endif /* !defined(wxUSE_TREECTRL) */
+#ifndef wxUSE_TREELISTCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_TREELISTCTRL must be defined, please read comment near the top of this file."
+# else
+# define wxUSE_TREELISTCTRL 0
+# endif
+#endif /* !defined(wxUSE_TREELISTCTRL) */
+
#ifndef wxUSE_UIACTIONSIMULATOR
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_UIACTIONSIMULATOR must be defined, please read comment near the top of this file."
@@ -1463,7 +1471,8 @@
wxUSE_STATUSBAR || \
wxUSE_TEXTCTRL || \
wxUSE_TOOLBAR || \
- wxUSE_TREECTRL
+ wxUSE_TREECTRL || \
+ wxUSE_TREELISTCTRL
# if !wxUSE_CONTROLS
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_CONTROLS unset but some controls used"
@@ -2001,7 +2010,7 @@
#endif
#if !wxUSE_IMAGLIST
-# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL
+# if wxUSE_TREECTRL || wxUSE_NOTEBOOK || wxUSE_LISTCTRL || wxUSE_TREELISTCTRL
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxImageList must be compiled as well"
# else
@@ -2128,6 +2137,15 @@
# endif
#endif /* wxUSE_VARIANT */
+#if wxUSE_TREELISTCTRL && !wxUSE_DATAVIEWCTRL
+# ifdef wxABORT_ON_CONFIG_ERROR
+# error "wxUSE_TREELISTCTRL requires wxDataViewCtrl"
+# else
+# undef wxUSE_TREELISTCTRL
+# define wxUSE_TREELISTCTRL 0
+# endif
+#endif /* wxUSE_TREELISTCTRL */
+
#endif /* wxUSE_GUI */
#endif /* _WX_CHKCONF_H_ */
diff --git a/include/wx/choicebk.h b/include/wx/choicebk.h
index 5dbbecc104..0539b353dd 100644
--- a/include/wx/choicebk.h
+++ b/include/wx/choicebk.h
@@ -68,7 +68,7 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
virtual int SetSelection(size_t n)
{ return DoSetSelection(n, SetSelection_SendEvent); }
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
diff --git a/include/wx/cocoa/notebook.h b/include/wx/cocoa/notebook.h
index 6cc8161ff0..e158a18fdd 100644
--- a/include/wx/cocoa/notebook.h
+++ b/include/wx/cocoa/notebook.h
@@ -97,7 +97,7 @@ public:
wxNotebookPage *win,
const wxString& strText,
bool bSelect = false,
- int imageId = -1 );
+ int imageId = NO_IMAGE );
protected:
};
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index a0245f9e23..831bed1c24 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -36,7 +36,13 @@ public:
wxItemContainer::Clear();
}
- bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+ // IsEmpty() is ambiguous because we inherit it from both wxItemContainer
+ // and wxTextEntry, and even if defined it here to help the compiler with
+ // choosing one of them, it would still be confusing for the human users of
+ // this class. So instead define the clearly named methods below and leave
+ // IsEmpty() ambiguous to trigger a compilation error if it's used.
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
// also bring in GetSelection() versions of both base classes in scope
//
diff --git a/include/wx/compositewin.h b/include/wx/compositewin.h
index 9e7b5fd6a1..1828de0979 100644
--- a/include/wx/compositewin.h
+++ b/include/wx/compositewin.h
@@ -3,7 +3,7 @@
// Purpose: wxCompositeWindow<> declaration
// Author: Vadim Zeitlin
// Created: 2011-01-02
-// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// RCS-ID: $Id$
// Copyright: (c) 2011 Vadim Zeitlin
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
@@ -110,7 +110,11 @@ private:
{
wxWindow * const child = *i;
- (child->*func)(arg);
+ // Allow NULL elements in the list, this makes the code of derived
+ // composite controls which may have optionally shown children
+ // simpler and it doesn't cost us much here.
+ if ( child )
+ (child->*func)(arg);
}
}
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 87bfcf12e2..a1639f2533 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -21,9 +21,11 @@
#include "wx/variant.h"
#include "wx/dynarray.h"
#include "wx/icon.h"
+#include "wx/itemid.h"
#include "wx/weakref.h"
#include "wx/vector.h"
#include "wx/dataobj.h"
+#include "wx/withimages.h"
class WXDLLIMPEXP_FWD_CORE wxImageList;
@@ -44,7 +46,6 @@ class WXDLLIMPEXP_FWD_CORE wxImageList;
// wxDataViewCtrl globals
// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_FWD_ADV wxDataViewItem;
class WXDLLIMPEXP_FWD_ADV wxDataViewModel;
class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
class WXDLLIMPEXP_FWD_ADV wxDataViewColumn;
@@ -78,34 +79,14 @@ extern WXDLLIMPEXP_DATA_ADV(const char) wxDataViewCtrlNameStr[];
// wxDataViewItem
// ---------------------------------------------------------
-class WXDLLIMPEXP_ADV wxDataViewItem
+// Make it a class and not a typedef to allow forward declaring it.
+class wxDataViewItem : public wxItemId
{
public:
- wxDataViewItem() : m_id(NULL) {}
- wxDataViewItem(const wxDataViewItem &item) : m_id(item.m_id) {}
-
- wxEXPLICIT wxDataViewItem(void* id) : m_id(id) {}
-
- bool IsOk() const { return m_id != NULL; }
- void* GetID() const { return m_id; }
- operator const void* () const { return m_id; }
-
-private:
- void* m_id;
+ wxDataViewItem() : wxItemId() { }
+ wxEXPLICIT wxDataViewItem(void* pItem) : wxItemId(pItem) { }
};
-inline
-bool operator==(const wxDataViewItem& left, const wxDataViewItem& right)
-{
- return left.GetID() == right.GetID();
-}
-
-inline
-bool operator!=(const wxDataViewItem& left, const wxDataViewItem& right)
-{
- return !(left == right);
-}
-
WX_DEFINE_ARRAY(wxDataViewItem, wxDataViewItemArray);
// ---------------------------------------------------------
@@ -682,7 +663,15 @@ public:
wxDataViewItem GetCurrentItem() const;
void SetCurrentItem(const wxDataViewItem& item);
- virtual wxDataViewItem GetSelection() const = 0;
+ // Selection: both GetSelection() and GetSelections() can be used for the
+ // controls both with and without wxDV_MULTIPLE style. For single selection
+ // controls GetSelections() is not very useful however. And for multi
+ // selection controls GetSelection() returns an invalid item if more than
+ // one item is selected. Use GetSelectedItemsCount() or HasSelection() to
+ // check if any items are selected at all.
+ virtual int GetSelectedItemsCount() const = 0;
+ bool HasSelection() const { return GetSelectedItemsCount() != 0; }
+ wxDataViewItem GetSelection() const;
virtual int GetSelections( wxDataViewItemArray & sel ) const = 0;
virtual void SetSelections( const wxDataViewItemArray & sel ) = 0;
virtual void Select( const wxDataViewItem & item ) = 0;
@@ -1230,10 +1219,11 @@ public:
//-----------------------------------------------------------------------------
-class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl
+class WXDLLIMPEXP_ADV wxDataViewTreeCtrl: public wxDataViewCtrl,
+ public wxWithImages
{
public:
- wxDataViewTreeCtrl() { Init(); }
+ wxDataViewTreeCtrl() { }
wxDataViewTreeCtrl(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -1241,13 +1231,9 @@ public:
long style = wxDV_NO_HEADER | wxDV_ROW_LINES,
const wxValidator& validator = wxDefaultValidator)
{
- Init();
-
Create(parent, id, pos, size, style, validator);
}
- virtual ~wxDataViewTreeCtrl();
-
bool Create(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -1263,24 +1249,21 @@ public:
bool IsContainer( const wxDataViewItem& item ) const
{ return GetStore()->IsContainer(item); }
- void SetImageList( wxImageList *imagelist );
- wxImageList* GetImageList() { return m_imageList; }
-
wxDataViewItem AppendItem( const wxDataViewItem& parent,
- const wxString &text, int icon = -1, wxClientData *data = NULL );
+ const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL );
wxDataViewItem PrependItem( const wxDataViewItem& parent,
- const wxString &text, int icon = -1, wxClientData *data = NULL );
+ const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL );
wxDataViewItem InsertItem( const wxDataViewItem& parent, const wxDataViewItem& previous,
- const wxString &text, int icon = -1, wxClientData *data = NULL );
+ const wxString &text, int icon = NO_IMAGE, wxClientData *data = NULL );
wxDataViewItem PrependContainer( const wxDataViewItem& parent,
- const wxString &text, int icon = -1, int expanded = -1,
+ const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE,
wxClientData *data = NULL );
wxDataViewItem AppendContainer( const wxDataViewItem& parent,
- const wxString &text, int icon = -1, int expanded = -1,
+ const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE,
wxClientData *data = NULL );
wxDataViewItem InsertContainer( const wxDataViewItem& parent, const wxDataViewItem& previous,
- const wxString &text, int icon = -1, int expanded = -1,
+ const wxString &text, int icon = NO_IMAGE, int expanded = NO_IMAGE,
wxClientData *data = NULL );
wxDataViewItem GetNthChild( const wxDataViewItem& parent, unsigned int pos ) const
@@ -1310,14 +1293,6 @@ public:
void OnCollapsed( wxDataViewEvent &event );
void OnSize( wxSizeEvent &event );
-private:
- void Init()
- {
- m_imageList = NULL;
- }
-
- wxImageList *m_imageList;
-
private:
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDataViewTreeCtrl)
diff --git a/include/wx/dc.h b/include/wx/dc.h
index f6346888ac..b519785afa 100644
--- a/include/wx/dc.h
+++ b/include/wx/dc.h
@@ -43,6 +43,10 @@ class WXDLLIMPEXP_FWD_CORE wxMemoryDC;
class WXDLLIMPEXP_FWD_CORE wxPrinterDC;
class WXDLLIMPEXP_FWD_CORE wxPrintData;
+#if wxUSE_GRAPHICS_CONTEXT
+class WXDLLIMPEXP_FWD_CORE wxGraphicsContext;
+#endif
+
// Logical ops
enum wxRasterOperationMode
{
@@ -471,7 +475,7 @@ public:
}
virtual void SetLogicalScale(double x, double y);
- virtual void GetLogicalScale(double *x, double *y)
+ virtual void GetLogicalScale(double *x, double *y) const
{
if ( x ) *x = m_logicalScaleX;
if ( y ) *y = m_logicalScaleY;
@@ -640,6 +644,13 @@ public:
virtual int GetResolution() const
{ return -1; }
+#if wxUSE_GRAPHICS_CONTEXT
+ virtual wxGraphicsContext* GetGraphicsContext() const
+ { return NULL; }
+ virtual void SetGraphicsContext( wxGraphicsContext* WXUNUSED(ctx) )
+ {}
+#endif
+
private:
wxDC *m_owner;
@@ -1009,7 +1020,7 @@ public:
void SetLogicalScale(double x, double y)
{ m_pimpl->SetLogicalScale( x, y ); }
- void GetLogicalScale(double *x, double *y)
+ void GetLogicalScale(double *x, double *y) const
{ m_pimpl->GetLogicalScale( x, y ); }
void SetLogicalOrigin(wxCoord x, wxCoord y)
@@ -1329,6 +1340,17 @@ public:
TempHDC GetTempHDC() { return TempHDC(*this); }
#endif // __WXMSW__
+#if wxUSE_GRAPHICS_CONTEXT
+ virtual wxGraphicsContext* GetGraphicsContext() const
+ {
+ return m_pimpl->GetGraphicsContext();
+ }
+ virtual void SetGraphicsContext( wxGraphicsContext* ctx )
+ {
+ m_pimpl->SetGraphicsContext(ctx);
+ }
+#endif
+
protected:
// ctor takes ownership of the pointer
wxDC(wxDCImpl *pimpl) : m_pimpl(pimpl) { }
diff --git a/include/wx/dcgraph.h b/include/wx/dcgraph.h
index 38ebbb61cc..99ecc11fca 100644
--- a/include/wx/dcgraph.h
+++ b/include/wx/dcgraph.h
@@ -32,6 +32,8 @@ public:
#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
wxGCDC( const wxEnhMetaFileDC& dc );
#endif
+ wxGCDC(wxGraphicsContext* context);
+
wxGCDC();
virtual ~wxGCDC();
diff --git a/include/wx/defs.h b/include/wx/defs.h
index 3b66b2e0a4..5376facc9d 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -2235,6 +2235,18 @@ enum wxItemKind
wxITEM_MAX
};
+/*
+ * The possible states of a 3-state checkbox (Compatible
+ * with the 2-state checkbox).
+ */
+enum wxCheckBoxState
+{
+ wxCHK_UNCHECKED,
+ wxCHK_CHECKED,
+ wxCHK_UNDETERMINED /* 3-state checkbox only */
+};
+
+
/* hit test results */
enum wxHitTest
{
@@ -2536,7 +2548,12 @@ enum wxKeyCode
WXK_WINDOWS_LEFT,
WXK_WINDOWS_RIGHT,
WXK_WINDOWS_MENU ,
- WXK_COMMAND,
+#ifdef __WXOSX__
+ WXK_RAW_CONTROL,
+#else
+ WXK_RAW_CONTROL = WXK_CONTROL,
+#endif
+ WXK_COMMAND = WXK_CONTROL,
/* Hardware-specific buttons */
WXK_SPECIAL1 = 193,
@@ -2572,10 +2589,11 @@ enum wxKeyModifier
wxMOD_META = 0x0008,
wxMOD_WIN = wxMOD_META,
#if defined(__WXMAC__) || defined(__WXCOCOA__)
- wxMOD_CMD = wxMOD_META,
+ wxMOD_RAW_CONTROL = 0x0010,
#else
- wxMOD_CMD = wxMOD_CONTROL,
+ wxMOD_RAW_CONTROL = wxMOD_CONTROL,
#endif
+ wxMOD_CMD = wxMOD_CONTROL,
wxMOD_ALL = 0xffff
};
@@ -3267,52 +3285,45 @@ typedef long WXPixel; /* safety catch in src/motif/colour.cpp */
#ifdef __WXGTK__
/* Stand-ins for GLIB types */
-typedef char gchar;
-typedef signed char gint8;
-typedef int gint;
-typedef unsigned guint;
-typedef unsigned long gulong;
-typedef void* gpointer;
typedef struct _GSList GSList;
/* Stand-ins for GDK types */
typedef struct _GdkColor GdkColor;
-typedef struct _GdkColormap GdkColormap;
-typedef struct _GdkFont GdkFont;
-typedef struct _GdkGC GdkGC;
-typedef struct _GdkVisual GdkVisual;
-
-#ifdef __WXGTK20__
-typedef struct _GdkAtom *GdkAtom;
-typedef struct _GdkDrawable GdkWindow;
-typedef struct _GdkDrawable GdkBitmap;
-typedef struct _GdkDrawable GdkPixmap;
-#else /* GTK+ 1.2 */
-typedef gulong GdkAtom;
-typedef struct _GdkWindow GdkWindow;
-typedef struct _GdkWindow GdkBitmap;
-typedef struct _GdkWindow GdkPixmap;
-#endif /* GTK+ 1.2/2.0 */
-
typedef struct _GdkCursor GdkCursor;
-typedef struct _GdkRegion GdkRegion;
typedef struct _GdkDragContext GdkDragContext;
-#ifdef HAVE_XIM
-typedef struct _GdkIC GdkIC;
-typedef struct _GdkICAttr GdkICAttr;
+#if defined(__WXGTK20__)
+ typedef struct _GdkAtom* GdkAtom;
+#else
+ typedef unsigned long GdkAtom;
+#endif
+
+#if !defined(__WXGTK30__)
+ typedef struct _GdkColormap GdkColormap;
+ typedef struct _GdkFont GdkFont;
+ typedef struct _GdkGC GdkGC;
+ typedef struct _GdkRegion GdkRegion;
+#endif
+
+#if defined(__WXGTK30__)
+ typedef struct _GdkWindow GdkWindow;
+#elif defined(__WXGTK20__)
+ typedef struct _GdkDrawable GdkWindow;
+ typedef struct _GdkDrawable GdkPixmap;
+#else
+ typedef struct _GdkWindow GdkWindow;
+ typedef struct _GdkWindow GdkBitmap;
+ typedef struct _GdkWindow GdkPixmap;
#endif
/* Stand-ins for GTK types */
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkRcStyle GtkRcStyle;
typedef struct _GtkAdjustment GtkAdjustment;
-typedef struct _GtkList GtkList;
typedef struct _GtkToolbar GtkToolbar;
typedef struct _GtkNotebook GtkNotebook;
typedef struct _GtkNotebookPage GtkNotebookPage;
typedef struct _GtkAccelGroup GtkAccelGroup;
-typedef struct _GtkItemFactory GtkItemFactory;
typedef struct _GtkSelectionData GtkSelectionData;
typedef struct _GtkTextBuffer GtkTextBuffer;
typedef struct _GtkRange GtkRange;
diff --git a/include/wx/dvrenderers.h b/include/wx/dvrenderers.h
index ca89147b0a..1d77b09114 100644
--- a/include/wx/dvrenderers.h
+++ b/include/wx/dvrenderers.h
@@ -54,6 +54,21 @@ public:
void SetIcon( const wxIcon &icon ) { m_icon = icon; }
const wxIcon &GetIcon() const { return m_icon; }
+ bool IsSameAs(const wxDataViewIconText& other) const
+ {
+ return m_text == other.m_text && m_icon.IsSameAs(other.m_icon);
+ }
+
+ bool operator==(const wxDataViewIconText& other) const
+ {
+ return IsSameAs(other);
+ }
+
+ bool operator!=(const wxDataViewIconText& other) const
+ {
+ return !IsSameAs(other);
+ }
+
private:
wxString m_text;
wxIcon m_icon;
@@ -61,19 +76,6 @@ private:
DECLARE_DYNAMIC_CLASS(wxDataViewIconText)
};
-inline
-bool operator==(const wxDataViewIconText& left, const wxDataViewIconText& right)
-{
- return left.GetText() == right.GetText() &&
- left.GetIcon().IsSameAs(right.GetIcon());
-}
-
-inline
-bool operator!=(const wxDataViewIconText& left, const wxDataViewIconText& right)
-{
- return !(left == right);
-}
-
DECLARE_VARIANT_OBJECT_EXPORTED(wxDataViewIconText, WXDLLIMPEXP_ADV)
// ----------------------------------------------------------------------------
@@ -171,8 +173,9 @@ protected:
wxWeakRef m_editorCtrl;
wxDataViewItem m_item; // for m_editorCtrl
- // internal utility:
- const wxDataViewCtrl* GetView() const;
+ // internal utility, may be used anywhere the window associated with the
+ // renderer is required
+ wxDataViewCtrl* GetView() const;
protected:
DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRendererBase)
diff --git a/include/wx/filepicker.h b/include/wx/filepicker.h
index 7e14d097d9..3b471b7aca 100644
--- a/include/wx/filepicker.h
+++ b/include/wx/filepicker.h
@@ -109,12 +109,14 @@ protected:
#define wxFLP_OVERWRITE_PROMPT 0x1000
#define wxFLP_FILE_MUST_EXIST 0x2000
#define wxFLP_CHANGE_DIR 0x4000
+#define wxFLP_SMALL wxPB_SMALL
// NOTE: wxMULTIPLE is not supported !
#define wxDIRP_DIR_MUST_EXIST 0x0008
#define wxDIRP_CHANGE_DIR 0x0010
+#define wxDIRP_SMALL wxPB_SMALL
// map platform-dependent controls which implement the wxFileDirPickerWidgetBase
@@ -253,13 +255,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxFLP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
- const wxString& name = wxFilePickerCtrlNameStr)
- {
- return wxFileDirPickerCtrlBase::CreateBase(parent, id, path,
- message, wildcard,
- pos, size, style,
- validator, name);
- }
+ const wxString& name = wxFilePickerCtrlNameStr);
void SetFileName(const wxFileName &filename)
{ SetPath(filename.GetFullPath()); }
@@ -306,8 +302,13 @@ protected:
// extracts the style for our picker from wxFileDirPickerCtrlBase's style
long GetPickerStyle(long style) const
{
- return (style & (wxFLP_OPEN|wxFLP_SAVE|wxFLP_OVERWRITE_PROMPT|
- wxFLP_FILE_MUST_EXIST|wxFLP_CHANGE_DIR|wxFLP_USE_TEXTCTRL));
+ return style & (wxFLP_OPEN |
+ wxFLP_SAVE |
+ wxFLP_OVERWRITE_PROMPT |
+ wxFLP_FILE_MUST_EXIST |
+ wxFLP_CHANGE_DIR |
+ wxFLP_USE_TEXTCTRL |
+ wxFLP_SMALL);
}
private:
@@ -358,14 +359,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = wxDIRP_DEFAULT_STYLE,
const wxValidator& validator = wxDefaultValidator,
- const wxString& name = wxDirPickerCtrlNameStr)
- {
- return wxFileDirPickerCtrlBase::CreateBase
- (
- parent, id, path, message, wxEmptyString,
- pos, size, style, validator, name
- );
- }
+ const wxString& name = wxDirPickerCtrlNameStr);
void SetDirName(const wxFileName &dirname)
{ SetPath(dirname.GetPath()); }
@@ -409,7 +403,12 @@ protected:
// extracts the style for our picker from wxFileDirPickerCtrlBase's style
long GetPickerStyle(long style) const
- { return (style & (wxDIRP_DIR_MUST_EXIST|wxDIRP_CHANGE_DIR|wxDIRP_USE_TEXTCTRL)); }
+ {
+ return style & (wxDIRP_DIR_MUST_EXIST |
+ wxDIRP_CHANGE_DIR |
+ wxDIRP_USE_TEXTCTRL |
+ wxDIRP_SMALL);
+ }
private:
DECLARE_DYNAMIC_CLASS(wxDirPickerCtrl)
diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 5b6282d4b2..bf7fa60792 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -59,8 +59,10 @@ enum wxBitmapType
wxBITMAP_TYPE_XBM_DATA,
wxBITMAP_TYPE_XPM,
wxBITMAP_TYPE_XPM_DATA,
- wxBITMAP_TYPE_TIF,
- wxBITMAP_TYPE_TIF_RESOURCE,
+ wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIFF_RESOURCE,
+ wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE,
wxBITMAP_TYPE_GIF,
wxBITMAP_TYPE_GIF_RESOURCE,
wxBITMAP_TYPE_PNG,
@@ -202,7 +204,7 @@ enum wxStockCursor
*/
#if defined(__WXMSW__) || defined(__WXPM__)
- #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_RESOURCE)
+ #define wxBITMAP(name) wxBitmap(wxT(#name), wxBITMAP_TYPE_BMP_RESOURCE)
#elif defined(__WXGTK__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__) || \
diff --git a/include/wx/generic/dataview.h b/include/wx/generic/dataview.h
index 6e728635de..e4f69aec2d 100644
--- a/include/wx/generic/dataview.h
+++ b/include/wx/generic/dataview.h
@@ -155,7 +155,7 @@ public:
virtual wxDataViewColumn *GetSortingColumn() const;
- virtual wxDataViewItem GetSelection() const;
+ virtual int GetSelectedItemsCount() const;
virtual int GetSelections( wxDataViewItemArray & sel ) const;
virtual void SetSelections( const wxDataViewItemArray & sel );
virtual void Select( const wxDataViewItem & item );
@@ -220,17 +220,23 @@ public: // utility functions not part of the API
// return the column displayed at the given position in the control
wxDataViewColumn *GetColumnAt(unsigned int pos) const;
+ virtual void OnInternalIdle();
+
private:
virtual wxDataViewItem DoGetCurrentItem() const;
virtual void DoSetCurrentItem(const wxDataViewItem& item);
void InvalidateColBestWidths();
void InvalidateColBestWidth(int idx);
+ void UpdateColWidths();
wxDataViewColumnList m_cols;
// cached column best widths or 0 if not computed, values are for
// respective columns from m_cols and the arrays have same size
wxVector m_colsBestWidths;
+ // m_colsBestWidths partially invalid, needs recomputing
+ bool m_colsDirty;
+
wxDataViewModelNotifier *m_notifier;
wxDataViewMainWindow *m_clientArea;
wxDataViewHeaderWindow *m_headerArea;
diff --git a/include/wx/generic/dvrenderers.h b/include/wx/generic/dvrenderers.h
index fe71dc45f6..5131894960 100644
--- a/include/wx/generic/dvrenderers.h
+++ b/include/wx/generic/dvrenderers.h
@@ -126,6 +126,11 @@ public:
wxDataViewModel *model,
const wxDataViewItem& item,
unsigned int col);
+
+ virtual bool WXOnActivate(const wxRect& cell,
+ wxDataViewModel *model,
+ const wxDataViewItem& item,
+ unsigned int col);
private:
bool m_toggle;
diff --git a/include/wx/generic/notebook.h b/include/wx/generic/notebook.h
index 32deb7564d..1bd34877be 100644
--- a/include/wx/generic/notebook.h
+++ b/include/wx/generic/notebook.h
@@ -107,7 +107,7 @@ public:
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
// callbacks
// ---------
diff --git a/include/wx/generic/srchctlg.h b/include/wx/generic/srchctlg.h
index 202abb9d5b..0d1fc5b539 100644
--- a/include/wx/generic/srchctlg.h
+++ b/include/wx/generic/srchctlg.h
@@ -191,6 +191,7 @@ public:
// wxWindow overrides
virtual bool SetFont(const wxFont& font);
+ virtual bool SetBackgroundColour(const wxColour& colour);
// search control generic only
void SetSearchBitmap( const wxBitmap& bitmap );
@@ -235,6 +236,9 @@ protected:
private:
friend class wxSearchButton;
+ // Implement pure virtual function inherited from wxCompositeWindow.
+ virtual wxWindowList GetCompositeWindowParts() const;
+
#if wxUSE_MENUS
void PopupSearchMenu();
#endif // wxUSE_MENUS
diff --git a/include/wx/graphics.h b/include/wx/graphics.h
index 0d472b5bca..6e7cf27fe3 100644
--- a/include/wx/graphics.h
+++ b/include/wx/graphics.h
@@ -24,7 +24,7 @@
enum wxAntialiasMode
{
wxANTIALIAS_NONE, // should be 0
- wxANTIALIAS_DEFAULT,
+ wxANTIALIAS_DEFAULT
};
enum wxInterpolationQuality
diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index 0954cd400b..57ff95fbf3 100644
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -75,7 +75,7 @@ private:
#if wxUSE_THREADS
wxMutex m_idleMutex;
#endif
- guint m_idleSourceId;
+ unsigned m_idleSourceId;
#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2
HildonProgram *m_hildonProgram;
diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 71f5d5b75c..560dfa24d0 100644
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -30,8 +30,8 @@ public:
virtual ~wxMask();
// implementation
- GdkBitmap *m_bitmap;
- GdkBitmap *GetBitmap() const;
+ GdkPixmap* m_bitmap;
+ GdkPixmap* GetBitmap() const;
protected:
virtual void FreeData();
diff --git a/include/wx/gtk/combobox.h b/include/wx/gtk/combobox.h
index fb718013c5..02ae7e481a 100644
--- a/include/wx/gtk/combobox.h
+++ b/include/wx/gtk/combobox.h
@@ -97,7 +97,9 @@ public:
wxItemContainer::Clear();
}
- bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+ // See wxComboBoxBase discussion of IsEmpty().
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
void OnChar( wxKeyEvent &event );
diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 594285f569..7e14b84d4b 100644
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -20,7 +20,7 @@ typedef struct _GtkFrame GtkFrame;
// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
extern "C" {
typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
- typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+ typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
}
diff --git a/include/wx/gtk/dataview.h b/include/wx/gtk/dataview.h
index 55beb85d48..8a4e12c354 100644
--- a/include/wx/gtk/dataview.h
+++ b/include/wx/gtk/dataview.h
@@ -142,7 +142,7 @@ public:
virtual wxDataViewColumn *GetSortingColumn() const;
- virtual wxDataViewItem GetSelection() const;
+ virtual int GetSelectedItemsCount() const;
virtual int GetSelections( wxDataViewItemArray & sel ) const;
virtual void SetSelections( const wxDataViewItemArray & sel );
virtual void Select( const wxDataViewItem & item );
diff --git a/include/wx/gtk/dnd.h b/include/wx/gtk/dnd.h
index 56fc48de6a..66a1c3a757 100644
--- a/include/wx/gtk/dnd.h
+++ b/include/wx/gtk/dnd.h
@@ -50,13 +50,13 @@ public:
GdkDragContext *m_dragContext;
GtkWidget *m_dragWidget;
GtkSelectionData *m_dragData;
- guint m_dragTime;
+ unsigned m_dragTime;
bool m_firstMotion; // gdk has no "gdk_drag_enter" event
void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
- void GTKSetDragTime( guint time ) { m_dragTime = time; }
+ void GTKSetDragTime(unsigned time) { m_dragTime = time; }
};
//-------------------------------------------------------------------------
diff --git a/include/wx/gtk/dvrenderer.h b/include/wx/gtk/dvrenderer.h
index c6ecb397e4..1c1bc50d6d 100644
--- a/include/wx/gtk/dvrenderer.h
+++ b/include/wx/gtk/dvrenderer.h
@@ -48,7 +48,7 @@ public:
//
// it validates the new value and notifies the model about the change by
// calling GtkOnCellChanged() if it was accepted
- virtual void GtkOnTextEdited(const gchar *itempath, const wxString& value);
+ virtual void GtkOnTextEdited(const char *itempath, const wxString& value);
GtkCellRenderer* GetGtkHandle() { return m_renderer; }
void GtkInitHandlers();
diff --git a/include/wx/gtk/dvrenderers.h b/include/wx/gtk/dvrenderers.h
index 563d30944d..f833f8edd3 100644
--- a/include/wx/gtk/dvrenderers.h
+++ b/include/wx/gtk/dvrenderers.h
@@ -303,7 +303,7 @@ public:
virtual bool GetValue( wxVariant &value ) const;
private:
- virtual void GtkOnTextEdited(const gchar *itempath, const wxString& str);
+ virtual void GtkOnTextEdited(const char *itempath, const wxString& str);
};
diff --git a/include/wx/gtk/fontpicker.h b/include/wx/gtk/fontpicker.h
index 80376e5de8..0a7cae4466 100644
--- a/include/wx/gtk/fontpicker.h
+++ b/include/wx/gtk/fontpicker.h
@@ -52,7 +52,7 @@ protected:
public: // used by the GTK callback only
- void SetNativeFontInfo(const gchar *gtkdescription)
+ void SetNativeFontInfo(const char *gtkdescription)
{ m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); }
private:
diff --git a/include/wx/gtk/notebook.h b/include/wx/gtk/notebook.h
index bad2b59524..aeb5399ea2 100644
--- a/include/wx/gtk/notebook.h
+++ b/include/wx/gtk/notebook.h
@@ -89,7 +89,7 @@ public:
wxNotebookPage *win,
const wxString& strText,
bool bSelect = false,
- int imageId = -1 );
+ int imageId = NO_IMAGE );
// handler for tab navigation
// --------------------------
diff --git a/include/wx/gtk/pen.h b/include/wx/gtk/pen.h
index 4f1a3cf7ed..2437073efb 100644
--- a/include/wx/gtk/pen.h
+++ b/include/wx/gtk/pen.h
@@ -10,7 +10,7 @@
#ifndef _WX_GTK_PEN_H_
#define _WX_GTK_PEN_H_
-typedef gint8 wxGTKDash;
+typedef signed char wxGTKDash;
//-----------------------------------------------------------------------------
// wxPen
diff --git a/include/wx/gtk/private/list.h b/include/wx/gtk/private/list.h
new file mode 100644
index 0000000000..b4e50ab428
--- /dev/null
+++ b/include/wx/gtk/private/list.h
@@ -0,0 +1,33 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/gtk/private/list.h
+// Purpose: wxGtkList class.
+// Author: Vadim Zeitlin
+// Created: 2011-08-21
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_PRIVATE_LIST_H_
+#define _WX_GTK_PRIVATE_LIST_H_
+
+// ----------------------------------------------------------------------------
+// Convenience class for calling g_list_free() automatically
+// ----------------------------------------------------------------------------
+
+class wxGtkList
+{
+public:
+ explicit wxGtkList(GList* list) : m_list(list) { }
+ ~wxGtkList() { g_list_free(m_list); }
+
+ operator GList *() const { return m_list; }
+ GList * operator->() const { return m_list; }
+
+protected:
+ GList* const m_list;
+
+ wxDECLARE_NO_COPY_CLASS(wxGtkList);
+};
+
+#endif // _WX_GTK_PRIVATE_LIST_H_
diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index df2e41dc11..8155d24305 100644
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -370,7 +370,7 @@ protected:
//
// This is just a wrapper for g_signal_connect() and returns the handler id
// just as it does.
- gulong GTKConnectWidget(const char *signal, void (*callback)());
+ unsigned long GTKConnectWidget(const char *signal, void (*callback)());
// Return true from here if PostCreation() should connect to size_request
// signal: this is done by default but doesn't work for some native
diff --git a/include/wx/gtk1/app.h b/include/wx/gtk1/app.h
index c7c2f39e0e..cd279468ff 100644
--- a/include/wx/gtk1/app.h
+++ b/include/wx/gtk1/app.h
@@ -14,6 +14,8 @@
#include "wx/icon.h"
#include "wx/strconv.h"
+typedef struct _GdkVisual GdkVisual;
+
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
@@ -53,7 +55,7 @@ public:
bool IsInAssert() const { return m_isInAssert; }
- gint m_idleTag;
+ int m_idleTag;
void RemoveIdleTag();
unsigned char *m_colorCube;
diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index 79ec3f47af..8815a7e69e 100644
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -31,7 +31,7 @@ typedef struct _GtkFrame GtkFrame;
// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget
extern "C" {
typedef GtkWidget* (*wxGtkWidgetNew_t)(void);
- typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*);
+ typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*);
typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*);
}
diff --git a/include/wx/gtk1/dnd.h b/include/wx/gtk1/dnd.h
index 01187d8a47..8102626aa2 100644
--- a/include/wx/gtk1/dnd.h
+++ b/include/wx/gtk1/dnd.h
@@ -65,13 +65,13 @@ public:
GdkDragContext *m_dragContext;
GtkWidget *m_dragWidget;
GtkSelectionData *m_dragData;
- guint m_dragTime;
+ unsigned m_dragTime;
bool m_firstMotion; // gdk has no "gdk_drag_enter" event
void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; }
void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; }
void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; }
- void SetDragTime( guint time ) { m_dragTime = time; }
+ void SetDragTime(unsigned time) { m_dragTime = time; }
};
//-------------------------------------------------------------------------
diff --git a/include/wx/gtk1/listbox.h b/include/wx/gtk1/listbox.h
index be62c96846..c9d6a48501 100644
--- a/include/wx/gtk1/listbox.h
+++ b/include/wx/gtk1/listbox.h
@@ -12,6 +12,8 @@
#include "wx/list.h"
+typedef struct _GtkList GtkList;
+
class WXDLLIMPEXP_FWD_BASE wxSortedArrayString;
//-----------------------------------------------------------------------------
diff --git a/include/wx/gtk1/notebook.h b/include/wx/gtk1/notebook.h
index 78c7ce5125..5be3df0b5b 100644
--- a/include/wx/gtk1/notebook.h
+++ b/include/wx/gtk1/notebook.h
@@ -89,7 +89,7 @@ public:
wxNotebookPage *win,
const wxString& strText,
bool bSelect = false,
- int imageId = -1 );
+ int imageId = NO_IMAGE );
// handler for tab navigation
// --------------------------
diff --git a/include/wx/gtk1/pen.h b/include/wx/gtk1/pen.h
index 97fea928a3..724b9b7920 100644
--- a/include/wx/gtk1/pen.h
+++ b/include/wx/gtk1/pen.h
@@ -23,9 +23,9 @@
class WXDLLIMPEXP_FWD_CORE wxPen;
#if defined(__WXGTK127__)
-typedef gint8 wxGTKDash;
+typedef signed char wxGTKDash;
#else
-typedef gchar wxGTKDash;
+typedef char wxGTKDash;
#endif
//-----------------------------------------------------------------------------
diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 8d37e57148..388f06fd91 100644
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -11,6 +11,10 @@
#define __GTKWINDOWH__
typedef struct _GtkTooltips GtkTooltips;
+#ifdef HAVE_XIM
+typedef struct _GdkIC GdkIC;
+typedef struct _GdkICAttr GdkICAttr;
+#endif
// helper structure that holds class that holds GtkIMContext object and
// some additional data needed for key events processing
diff --git a/include/wx/imagtiff.h b/include/wx/imagtiff.h
index 3021a61e4a..f1f4f74c6f 100644
--- a/include/wx/imagtiff.h
+++ b/include/wx/imagtiff.h
@@ -22,10 +22,17 @@
#include "wx/versioninfo.h"
// defines for wxImage::SetOption
-#define wxIMAGE_OPTION_BITSPERSAMPLE wxString(wxT("BitsPerSample"))
-#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel"))
-#define wxIMAGE_OPTION_COMPRESSION wxString(wxT("Compression"))
-#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor"))
+#define wxIMAGE_OPTION_TIFF_BITSPERSAMPLE wxString(wxT("BitsPerSample"))
+#define wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL wxString(wxT("SamplesPerPixel"))
+#define wxIMAGE_OPTION_TIFF_COMPRESSION wxString(wxT("Compression"))
+#define wxIMAGE_OPTION_TIFF_PHOTOMETRIC wxString(wxT("Photometric"))
+#define wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR wxString(wxT("ImageDescriptor"))
+
+// for backwards compatibility
+#define wxIMAGE_OPTION_BITSPERSAMPLE wxIMAGE_OPTION_TIFF_BITSPERSAMPLE
+#define wxIMAGE_OPTION_SAMPLESPERPIXEL wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL
+#define wxIMAGE_OPTION_COMPRESSION wxIMAGE_OPTION_TIFF_COMPRESSION
+#define wxIMAGE_OPTION_IMAGEDESCRIPTOR wxIMAGE_OPTION_TIFF_IMAGEDESCRIPTOR
class WXDLLIMPEXP_CORE wxTIFFHandler: public wxImageHandler
{
diff --git a/include/wx/itemid.h b/include/wx/itemid.h
new file mode 100644
index 0000000000..2b6e59dd1e
--- /dev/null
+++ b/include/wx/itemid.h
@@ -0,0 +1,62 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/itemid.h
+// Purpose: wxItemId class declaration.
+// Author: Vadim Zeitlin
+// Created: 2011-08-17
+// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_ITEMID_H_
+#define _WX_ITEMID_H_
+
+// ----------------------------------------------------------------------------
+// wxItemId: an opaque item identifier used with wx{Tree,TreeList,DataView}Ctrl.
+// ----------------------------------------------------------------------------
+
+// The template argument T is typically a pointer to some opaque type. While
+// wxTreeItemId and wxDataViewItem use a pointer to void, this is dangerous and
+// not recommended for the new item id classes.
+template
+class wxItemId
+{
+public:
+ typedef T Type;
+
+ // This ctor is implicit which is fine for non-void* types, but if you use
+ // this class with void* you're strongly advised to make the derived class
+ // ctor explicit as implicitly converting from any pointer is simply too
+ // dangerous.
+ wxItemId(Type item = NULL) : m_pItem(item) { }
+
+ // Default copy ctor, assignment operator and dtor are ok.
+
+ bool IsOk() const { return m_pItem != NULL; }
+ Type GetID() const { return m_pItem; }
+ operator const Type() const { return m_pItem; }
+
+ // This is used for implementation purposes only.
+ Type operator->() const { return m_pItem; }
+
+ void Unset() { m_pItem = NULL; }
+
+ // This field is public *only* for compatibility with the old wxTreeItemId
+ // implementation and must not be used in any new code.
+//private:
+ Type m_pItem;
+};
+
+template
+bool operator==(const wxItemId& left, const wxItemId& right)
+{
+ return left.GetID() == right.GetID();
+}
+
+template
+bool operator!=(const wxItemId& left, const wxItemId& right)
+{
+ return !(left == right);
+}
+
+#endif // _WX_ITEMID_H_
diff --git a/include/wx/kbdstate.h b/include/wx/kbdstate.h
index d2055a0c09..b50c2a4fce 100644
--- a/include/wx/kbdstate.h
+++ b/include/wx/kbdstate.h
@@ -45,6 +45,9 @@ public:
return (m_controlDown ? wxMOD_CONTROL : 0) |
(m_shiftDown ? wxMOD_SHIFT : 0) |
(m_metaDown ? wxMOD_META : 0) |
+#ifdef __WXOSX__
+ (m_rawControlDown ? wxMOD_RAW_CONTROL : 0) |
+#endif
(m_altDown ? wxMOD_ALT : 0);
}
@@ -53,6 +56,14 @@ public:
// accessors for individual modifier keys
bool ControlDown() const { return m_controlDown; }
+ bool RawControlDown() const
+ {
+#ifdef __WXOSX__
+ return m_rawControlDown;
+#else
+ return m_controlDown;
+#endif
+ }
bool ShiftDown() const { return m_shiftDown; }
bool MetaDown() const { return m_metaDown; }
bool AltDown() const { return m_altDown; }
@@ -64,17 +75,21 @@ public:
// purpose under Mac)
bool CmdDown() const
{
-#if defined(__WXMAC__) || defined(__WXCOCOA__)
- return MetaDown();
-#else
return ControlDown();
-#endif
}
// these functions are mostly used by wxWidgets itself
// ---------------------------------------------------
void SetControlDown(bool down) { m_controlDown = down; }
+ void SetRawControlDown(bool down)
+ {
+#ifdef __WXOSX__
+ m_rawControlDown = down;
+#else
+ m_controlDown = down;
+#endif
+ }
void SetShiftDown(bool down) { m_shiftDown = down; }
void SetAltDown(bool down) { m_altDown = down; }
void SetMetaDown(bool down) { m_metaDown = down; }
@@ -84,10 +99,13 @@ public:
// members of wxKeyEvent directly, these variables are public, however you
// should not use them in any new code, please use the accessors instead
public:
- bool m_controlDown : 1;
- bool m_shiftDown : 1;
- bool m_altDown : 1;
- bool m_metaDown : 1;
+ bool m_controlDown : 1;
+ bool m_shiftDown : 1;
+ bool m_altDown : 1;
+ bool m_metaDown : 1;
+#ifdef __WXOSX__
+ bool m_rawControlDown : 1;
+#endif
};
#endif // _WX_KBDSTATE_H_
diff --git a/include/wx/listbook.h b/include/wx/listbook.h
index 052b463024..48140dc0bb 100644
--- a/include/wx/listbook.h
+++ b/include/wx/listbook.h
@@ -69,7 +69,7 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
diff --git a/include/wx/motif/combobox.h b/include/wx/motif/combobox.h
index e7e3598ed6..94ca4efb1c 100644
--- a/include/wx/motif/combobox.h
+++ b/include/wx/motif/combobox.h
@@ -69,6 +69,10 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
+ // See wxComboBoxBase discussion of IsEmpty().
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
// resolve ambiguities among virtual functions inherited from both base
// classes
virtual void Clear();
diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 4e1a836115..fafa63b0dc 100644
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -803,6 +803,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -840,6 +841,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h
index f656e081e8..4f4a99458b 100644
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -75,6 +75,10 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxComboBoxNameStr);
+ // See wxComboBoxBase discussion of IsEmpty().
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
// resolve ambiguities among virtual functions inherited from both base
// classes
virtual void Clear();
diff --git a/include/wx/msw/notebook.h b/include/wx/msw/notebook.h
index 70993e4d61..bb8ca64cc2 100644
--- a/include/wx/msw/notebook.h
+++ b/include/wx/msw/notebook.h
@@ -96,7 +96,7 @@ public:
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
// Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
// style.
diff --git a/include/wx/msw/private/button.h b/include/wx/msw/private/button.h
index 1e6336197d..2f344f2d53 100644
--- a/include/wx/msw/private/button.h
+++ b/include/wx/msw/private/button.h
@@ -44,7 +44,8 @@ void UpdateMultilineStyle(HWND hwnd, const wxString& label);
// flags for ComputeBestSize() and GetFittingSize()
enum
{
- Size_AuthNeeded = 1
+ Size_AuthNeeded = 1,
+ Size_ExactFit = 2
};
// NB: All the functions below are implemented in src/msw/button.cpp
diff --git a/include/wx/msw/progdlg.h b/include/wx/msw/progdlg.h
index 8102c9fdf1..459002410f 100644
--- a/include/wx/msw/progdlg.h
+++ b/include/wx/msw/progdlg.h
@@ -47,6 +47,8 @@ public:
// Must provide overload to avoid hiding it (and warnings about it)
virtual void Update() { wxGenericProgressDialog::Update(); }
+ virtual WXWidget GetHandle() const;
+
private:
// Performs common routines to Update() and Pulse(). Requires the
// shared object to have been entered.
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4f2abb3cb7..ce3af5edde 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -821,6 +821,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -858,6 +859,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/msw/textentry.h b/include/wx/msw/textentry.h
index a2f5f95be5..c42ef8d89d 100644
--- a/include/wx/msw/textentry.h
+++ b/include/wx/msw/textentry.h
@@ -75,7 +75,7 @@ protected:
// wxUSE_OLE as OleInitialize() is not called then
#if wxUSE_OLE
virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
- virtual bool DoAutoCompleteFileNames();
+ virtual bool DoAutoCompleteFileNames(int flags);
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
#endif // wxUSE_OLE
diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index ce854d68cd..4ed343f02b 100644
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -803,6 +803,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -840,6 +841,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/os2/combobox.h b/include/wx/os2/combobox.h
index 92039b8a37..233d0f0d02 100644
--- a/include/wx/os2/combobox.h
+++ b/include/wx/os2/combobox.h
@@ -96,6 +96,10 @@ class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
,const wxString& rsName = wxComboBoxNameStr
);
+ // See wxComboBoxBase discussion of IsEmpty().
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
+
// resolve ambiguities among virtual functions inherited from both base
// classes
virtual void Clear();
diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 267647d251..8700e76713 100644
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -803,6 +803,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -840,6 +841,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/osx/carbon/dataview.h b/include/wx/osx/carbon/dataview.h
index b6d88a2661..ca6a5e5ea4 100644
--- a/include/wx/osx/carbon/dataview.h
+++ b/include/wx/osx/carbon/dataview.h
@@ -406,6 +406,7 @@ public:
//
virtual wxDataViewItem GetCurrentItem() const;
virtual void SetCurrentItem(const wxDataViewItem& item);
+ virtual int GetSelectedItemsCount() const;
virtual int GetSelections(wxDataViewItemArray& sel) const;
virtual bool IsSelected (wxDataViewItem const& item) const;
virtual void Select (wxDataViewItem const& item);
diff --git a/include/wx/osx/cocoa/dataview.h b/include/wx/osx/cocoa/dataview.h
index 624c2cb3f7..e4c5ef65d4 100644
--- a/include/wx/osx/cocoa/dataview.h
+++ b/include/wx/osx/cocoa/dataview.h
@@ -474,6 +474,7 @@ public:
//
virtual wxDataViewItem GetCurrentItem() const;
virtual void SetCurrentItem(const wxDataViewItem& item);
+ virtual int GetSelectedItemsCount() const;
virtual int GetSelections(wxDataViewItemArray& sel) const;
virtual bool IsSelected(const wxDataViewItem& item) const;
virtual void Select(const wxDataViewItem& item);
diff --git a/include/wx/osx/cocoa/private.h b/include/wx/osx/cocoa/private.h
index a9d77d1fc5..a0a929df8d 100644
--- a/include/wx/osx/cocoa/private.h
+++ b/include/wx/osx/cocoa/private.h
@@ -352,7 +352,22 @@ protected :
- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
@end
- WXEXPORT @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER()
+ // This interface must be exported in shared 64 bit multilib build but
+ // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1)
+ // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit
+ // builds but seems to be unnecessary there so to avoid the expense of a
+ // configure check verifying if this does work or not with the current
+ // compiler we just only use it for 64 bit builds where this is always
+ // supported.
+ //
+ // NB: Currently this is the only place where we need to export an
+ // interface but if we need to do it elsewhere we should define a
+ // WXEXPORT_OBJC macro once and reuse it in all places it's needed
+ // instead of duplicating this preprocessor check.
+#ifdef __LP64__
+ WXEXPORT
+#endif // 64 bit builds
+ @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER()
{
}
diff --git a/include/wx/osx/core/dataview.h b/include/wx/osx/core/dataview.h
index 1a554d704b..20b0fe9bdd 100644
--- a/include/wx/osx/core/dataview.h
+++ b/include/wx/osx/core/dataview.h
@@ -89,6 +89,7 @@ public:
virtual wxDataViewItem GetCurrentItem() const = 0;
virtual void SetCurrentItem(const wxDataViewItem& item) = 0;
+ virtual int GetSelectedItemsCount() const = 0;
virtual int GetSelections(wxDataViewItemArray& sel) const = 0; // returns all selected items in the native control
virtual bool IsSelected (wxDataViewItem const& item) const = 0; // checks if the passed item is selected in the native control
virtual void Select (wxDataViewItem const& item) = 0; // selects the passed item in the native control
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index e585fa01d3..883438001f 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -176,7 +176,7 @@ public:
virtual unsigned int GetCount() const;
virtual wxRect GetItemRect(const wxDataViewItem& item, const wxDataViewColumn* columnPtr) const;
- virtual wxDataViewItem GetSelection() const;
+ virtual int GetSelectedItemsCount() const;
virtual int GetSelections(wxDataViewItemArray& sel) const;
virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const;
diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index 3447388f95..1affba34a9 100644
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -95,7 +95,7 @@ public:
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
// callbacks
// ---------
diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 57192429e2..84e6011ec7 100644
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -804,6 +804,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -841,6 +842,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/palmos/notebook.h b/include/wx/palmos/notebook.h
index 5e85e4259d..3c603a8169 100644
--- a/include/wx/palmos/notebook.h
+++ b/include/wx/palmos/notebook.h
@@ -127,7 +127,7 @@ public:
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
void AddPageInfo( wxNotebookPageInfo* info ) { AddPage( info->GetPage() , info->GetText() , info->GetSelected() , info->GetImageId() ) ; }
const wxNotebookPageInfoList& GetPageInfos() const ;
diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 96b03fa46d..c223a86c59 100644
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -803,6 +803,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -840,6 +841,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/persist/splitter.h b/include/wx/persist/splitter.h
new file mode 100644
index 0000000000..d80b378a4b
--- /dev/null
+++ b/include/wx/persist/splitter.h
@@ -0,0 +1,69 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/persist/splitter.h
+// Purpose: Persistence support for wxSplitterWindow.
+// Author: Vadim Zeitlin
+// Created: 2011-08-31
+// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_PERSIST_SPLITTER_H_
+#define _WX_PERSIST_SPLITTER_H_
+
+#include "wx/persist/window.h"
+
+#include "wx/splitter.h"
+
+// ----------------------------------------------------------------------------
+// string constants used by wxPersistentSplitter
+// ----------------------------------------------------------------------------
+
+#define wxPERSIST_SPLITTER_KIND "Splitter"
+
+// Special position value of -1 means the splitter is not split at all.
+#define wxPERSIST_SPLITTER_POSITION "Position"
+
+// ----------------------------------------------------------------------------
+// wxPersistentSplitter: supports saving/restoring splitter position
+// ----------------------------------------------------------------------------
+
+class wxPersistentSplitter : public wxPersistentWindow
+{
+public:
+ wxPersistentSplitter(wxSplitterWindow* splitter)
+ : wxPersistentWindow(splitter)
+ {
+ }
+
+ virtual void Save() const
+ {
+ wxSplitterWindow* const splitter = Get();
+
+ int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1;
+ SaveValue(wxPERSIST_SPLITTER_POSITION, pos);
+ }
+
+ virtual bool Restore()
+ {
+ int pos;
+ if ( RestoreValue(wxPERSIST_SPLITTER_POSITION, &pos) )
+ {
+ if ( pos == -1 )
+ Get()->Unsplit();
+ else
+ Get()->SetSashPosition(pos);
+ }
+
+ return false;
+ }
+
+ virtual wxString GetKind() const { return wxPERSIST_SPLITTER_KIND; }
+};
+
+inline wxPersistentObject *wxCreatePersistentObject(wxSplitterWindow* splitter)
+{
+ return new wxPersistentSplitter(splitter);
+}
+
+#endif // _WX_PERSIST_SPLITTER_H_
diff --git a/include/wx/pickerbase.h b/include/wx/pickerbase.h
index 56a30d0873..16afd715f0 100644
--- a/include/wx/pickerbase.h
+++ b/include/wx/pickerbase.h
@@ -31,6 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
// ----------------------------------------------------------------------------
#define wxPB_USE_TEXTCTRL 0x0002
+#define wxPB_SMALL 0x8000
class WXDLLIMPEXP_CORE wxPickerBase : public wxNavigationEnabled
{
diff --git a/include/wx/richtext/richtextformatdlg.h b/include/wx/richtext/richtextformatdlg.h
index 9b0898e491..53abf8ac7d 100644
--- a/include/wx/richtext/richtextformatdlg.h
+++ b/include/wx/richtext/richtextformatdlg.h
@@ -22,6 +22,7 @@
#include "wx/propdlg.h"
#include "wx/bookctrl.h"
+#include "wx/withimages.h"
#if wxUSE_HTML
#include "wx/htmllbox.h"
@@ -32,7 +33,6 @@
#include "wx/richtext/richtextuicustomization.h"
class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
-class WXDLLIMPEXP_FWD_CORE wxImageList;
class WXDLLIMPEXP_FWD_CORE wxComboBox;
class WXDLLIMPEXP_FWD_CORE wxCheckBox;
@@ -119,7 +119,8 @@ public:
* Formatting dialog for a wxRichTextCtrl
*/
-class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog
+class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog,
+ public wxWithImages
{
DECLARE_CLASS(wxRichTextFormattingDialog)
DECLARE_HELP_PROVISION()
@@ -194,10 +195,6 @@ public:
void OnHelp(wxCommandEvent& event);
void OnUpdateHelp(wxUpdateUIEvent& event);
- /// Set/get image list
- void SetImageList(wxImageList* imageList) { m_imageList = imageList; }
- wxImageList* GetImageList() const { return m_imageList; }
-
/// Get/set formatting factory object
static void SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory);
static wxRichTextFormattingDialogFactory* GetFormattingDialogFactory() { return ms_FormattingDialogFactory; }
@@ -237,7 +234,6 @@ public:
protected:
- wxImageList* m_imageList;
wxRichTextAttr m_attributes;
//wxRichTextAttr m_resetAttributes;
wxRichTextStyleDefinition* m_styleDefinition;
diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index c96db8881d..2b3ce56c6e 100644
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -827,6 +827,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -864,6 +865,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 74a60c303d..2cdccbd3b5 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -26,10 +26,11 @@
// no native version, use the generic one
#define wxUSE_NATIVE_SEARCH_CONTROL 0
+ #include "wx/compositewin.h"
#include "wx/containr.h"
class WXDLLIMPEXP_CORE wxSearchCtrlBaseBaseClass
- : public wxNavigationEnabled,
+ : public wxCompositeWindow< wxNavigationEnabled >,
public wxTextCtrlIface
{
};
diff --git a/include/wx/textentry.h b/include/wx/textentry.h
index 7601444ca8..2ede40d714 100644
--- a/include/wx/textentry.h
+++ b/include/wx/textentry.h
@@ -20,6 +20,7 @@ class WXDLLIMPEXP_FWD_CORE wxTextCompleter;
class WXDLLIMPEXP_FWD_CORE wxTextEntryHintData;
class WXDLLIMPEXP_FWD_CORE wxWindow;
+#include "wx/filefn.h" // for wxFILE and wxDIR only
#include "wx/gdicmn.h" // for wxPoint
// ----------------------------------------------------------------------------
@@ -117,7 +118,10 @@ public:
{ return DoAutoCompleteStrings(choices); }
bool AutoCompleteFileNames()
- { return DoAutoCompleteFileNames(); }
+ { return DoAutoCompleteFileNames(wxFILE); }
+
+ bool AutoCompleteDirectories()
+ { return DoAutoCompleteFileNames(wxDIR); }
// notice that we take ownership of the pointer and will delete it
//
@@ -230,7 +234,8 @@ protected:
// the other one(s)
virtual bool DoAutoCompleteStrings(const wxArrayString& WXUNUSED(choices))
{ return false; }
- virtual bool DoAutoCompleteFileNames() { return false; }
+ virtual bool DoAutoCompleteFileNames(int WXUNUSED(flags)) // wxFILE | wxDIR
+ { return false; }
virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
diff --git a/include/wx/toolbook.h b/include/wx/toolbook.h
index d39df2e99f..bfe6211e8f 100644
--- a/include/wx/toolbook.h
+++ b/include/wx/toolbook.h
@@ -78,7 +78,7 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
virtual int SetSelection(size_t n) { return DoSetSelection(n, SetSelection_SendEvent); }
virtual int ChangeSelection(size_t n) { return DoSetSelection(n); }
virtual void SetImageList(wxImageList *imageList);
diff --git a/include/wx/treebase.h b/include/wx/treebase.h
index e623660865..4a6063c2f6 100644
--- a/include/wx/treebase.h
+++ b/include/wx/treebase.h
@@ -23,6 +23,7 @@
#include "wx/window.h" // for wxClientData
#include "wx/event.h"
#include "wx/dynarray.h"
+#include "wx/itemid.h"
#if WXWIN_COMPATIBILITY_2_6
@@ -38,53 +39,19 @@ enum
#endif // WXWIN_COMPATIBILITY_2_6
// ----------------------------------------------------------------------------
-// wxTreeItemId identifies an element of the tree. In this implementation, it's
-// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
-// data structure in the generic version. It's opaque for the application and
-// the only method which can be used by user code is IsOk().
+// wxTreeItemId identifies an element of the tree. It's opaque for the
+// application and the only method which can be used by user code is IsOk().
// ----------------------------------------------------------------------------
-// Using this typedef removes an ambiguity when calling Remove()
-typedef void *wxTreeItemIdValue;
-
-class WXDLLIMPEXP_CORE wxTreeItemId
+// This is a class and not a typedef because existing code may forward declare
+// wxTreeItemId as a class and we don't want to break it without good reason.
+class wxTreeItemId : public wxItemId
{
- friend bool operator==(const wxTreeItemId&, const wxTreeItemId&);
public:
- // ctors
- // 0 is invalid value for HTREEITEM
- wxTreeItemId() { m_pItem = 0; }
-
- // construct wxTreeItemId from the native item id
- wxTreeItemId(void *pItem) { m_pItem = pItem; }
-
- // default copy ctor/assignment operator are ok for us
-
- // accessors
- // is this a valid tree item?
- bool IsOk() const { return m_pItem != 0; }
- // return true if this item is not valid
- bool operator!() const { return !IsOk(); }
-
- // operations
- // invalidate the item
- void Unset() { m_pItem = 0; }
-
- operator bool() const { return IsOk(); }
-
- wxTreeItemIdValue m_pItem;
+ wxTreeItemId() : wxItemId() { }
+ wxTreeItemId(void* pItem) : wxItemId(pItem) { }
};
-inline bool operator==(const wxTreeItemId& i1, const wxTreeItemId& i2)
-{
- return i1.m_pItem == i2.m_pItem;
-}
-
-inline bool operator!=(const wxTreeItemId& i1, const wxTreeItemId& i2)
-{
- return i1.m_pItem != i2.m_pItem;
-}
-
// ----------------------------------------------------------------------------
// wxTreeItemData is some (arbitrary) user class associated with some item. The
// main advantage of having this class (compared to old untyped interface) is
@@ -119,10 +86,12 @@ protected:
wxTreeItemId m_pItem;
};
+typedef void *wxTreeItemIdValue;
+
WX_DEFINE_EXPORTED_ARRAY_PTR(wxTreeItemIdValue, wxArrayTreeItemIdsBase);
// this is a wrapper around the array class defined above which allow to wok
-// with vaue of natural wxTreeItemId type instead of using wxTreeItemIdValue
+// with values of natural wxTreeItemId type instead of using wxTreeItemIdValue
// and does it without any loss of efficiency
class WXDLLIMPEXP_CORE wxArrayTreeItemIds : public wxArrayTreeItemIdsBase
{
diff --git a/include/wx/treebook.h b/include/wx/treebook.h
index 86aa0acabc..30bc563e0d 100644
--- a/include/wx/treebook.h
+++ b/include/wx/treebook.h
@@ -74,27 +74,27 @@ public:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
// Inserts a new sub-page to the end of children of the page at given pos.
virtual bool InsertSubPage(size_t pos,
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
// Adds a new page at top level after all other pages.
virtual bool AddPage(wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
// Adds a new child-page to the last top-level page inserted.
// Useful when constructing 1 level tree structure.
virtual bool AddSubPage(wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
// Deletes the page and ALL its children. Could trigger page selection
// change in a case when selected page is removed. In that case its parent
@@ -169,16 +169,16 @@ private:
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
bool DoInsertSubPage(size_t pos,
wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
bool DoAddSubPage(wxWindow *page,
const wxString& text,
bool bSelect = false,
- int imageId = wxNOT_FOUND);
+ int imageId = NO_IMAGE);
// Sets selection in the tree control and updates the page being shown.
int DoSetSelection(size_t pos, int flags = 0);
diff --git a/include/wx/treelist.h b/include/wx/treelist.h
new file mode 100644
index 0000000000..1f013e8a37
--- /dev/null
+++ b/include/wx/treelist.h
@@ -0,0 +1,463 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/treelist.h
+// Purpose: wxTreeListCtrl class declaration.
+// Author: Vadim Zeitlin
+// Created: 2011-08-17
+// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TREELIST_H_
+#define _WX_TREELIST_H_
+
+#include "wx/defs.h"
+
+#if wxUSE_TREELISTCTRL
+
+#include "wx/compositewin.h"
+#include "wx/containr.h"
+#include "wx/headercol.h"
+#include "wx/itemid.h"
+#include "wx/vector.h"
+#include "wx/window.h"
+#include "wx/withimages.h"
+
+class WXDLLIMPEXP_FWD_ADV wxDataViewCtrl;
+class WXDLLIMPEXP_FWD_ADV wxDataViewEvent;
+
+extern WXDLLIMPEXP_DATA_CORE(const char) wxTreeListCtrlNameStr[];
+
+class wxTreeListModel;
+class wxTreeListModelNode;
+
+// ----------------------------------------------------------------------------
+// Constants.
+// ----------------------------------------------------------------------------
+
+// wxTreeListCtrl styles.
+//
+// Notice that using wxTL_USER_3STATE implies wxTL_3STATE and wxTL_3STATE in
+// turn implies wxTL_CHECKBOX.
+enum
+{
+ wxTL_SINGLE = 0x0000, // This is the default anyhow.
+ wxTL_MULTIPLE = 0x0001, // Allow multiple selection.
+ wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column.
+ wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes.
+ wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state.
+
+ wxTL_DEFAULT_STYLE = wxTL_SINGLE,
+ wxTL_STYLE_MASK = wxTL_SINGLE |
+ wxTL_MULTIPLE |
+ wxTL_CHECKBOX |
+ wxTL_3STATE |
+ wxTL_USER_3STATE
+};
+
+// ----------------------------------------------------------------------------
+// wxTreeListItem: unique identifier of an item in wxTreeListCtrl.
+// ----------------------------------------------------------------------------
+
+// Make wxTreeListItem a forward-declarable class even though it's simple
+// enough to possibly be declared as a simple typedef.
+class wxTreeListItem : public wxItemId
+{
+public:
+ wxTreeListItem(wxTreeListModelNode* item = NULL)
+ : wxItemId(item)
+ {
+ }
+};
+
+// Container of multiple items.
+typedef wxVector wxTreeListItems;
+
+// Some special "items" that can be used with InsertItem():
+extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_FIRST;
+extern WXDLLIMPEXP_DATA_ADV(const wxTreeListItem) wxTLI_LAST;
+
+// ----------------------------------------------------------------------------
+// wxTreeListCtrl: a control combining wxTree- and wxListCtrl features.
+// ----------------------------------------------------------------------------
+
+// This control also provides easy to use high level interface. Although the
+// implementation uses wxDataViewCtrl internally, this class is intentionally
+// simpler than wxDataViewCtrl and doesn't provide all of its functionality.
+//
+// If you need extra features you can always use GetDataView() accessor to work
+// with wxDataViewCtrl directly but doing this makes your unportable to possible
+// future non-wxDataViewCtrl-based implementations of this class.
+
+class WXDLLIMPEXP_ADV wxTreeListCtrl
+ : public wxCompositeWindow< wxNavigationEnabled >,
+ public wxWithImages
+{
+public:
+ // Constructors and such
+ // ---------------------
+
+ wxTreeListCtrl() { Init(); }
+ wxTreeListCtrl(wxWindow* parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTL_DEFAULT_STYLE,
+ const wxString& name = wxTreeListCtrlNameStr)
+ {
+ Init();
+
+ Create(parent, id, pos, size, style, name);
+ }
+
+ bool Create(wxWindow* parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTL_DEFAULT_STYLE,
+ const wxString& name = wxTreeListCtrlNameStr);
+
+
+ virtual ~wxTreeListCtrl();
+
+ // Columns methods
+ // ---------------
+
+ // Add a column with the given title and attributes, returns the index of
+ // the new column or -1 on failure.
+ int AppendColumn(const wxString& title,
+ int width = wxCOL_WIDTH_AUTOSIZE,
+ wxAlignment align = wxALIGN_LEFT,
+ int flags = wxCOL_RESIZABLE)
+ {
+ return DoInsertColumn(title, -1, width, align, flags);
+ }
+
+ // Return the total number of columns.
+ unsigned GetColumnCount() const;
+
+ // Delete the column with the given index, returns false if index is
+ // invalid or deleting the column failed for some other reason.
+ bool DeleteColumn(unsigned col);
+
+ // Delete all columns.
+ void ClearColumns();
+
+ // Set column width to either the given value in pixels or to the value
+ // large enough to fit all of the items if width == wxCOL_WIDTH_AUTOSIZE.
+ void SetColumnWidth(unsigned col, int width);
+
+ // Get the current width of the given column in pixels.
+ int GetColumnWidth(unsigned col) const;
+
+ // Get the width appropriate for showing the given text. This is typically
+ // used as second argument for AppendColumn() or with SetColumnWidth().
+ int WidthFor(const wxString& text) const;
+
+
+ // Item methods
+ // ------------
+
+ // Adding items. The parent and text of the first column of the new item
+ // must always be specified, the rest is optional.
+ //
+ // Each item can have two images: one used for closed state and another for
+ // opened one. Only the first one is ever used for the items that don't
+ // have children. And both are not set by default.
+ //
+ // It is also possible to associate arbitrary client data pointer with the
+ // new item. It will be deleted by the control when the item is deleted
+ // (either by an explicit DeleteItem() call or because the entire control
+ // is destroyed).
+
+ wxTreeListItem AppendItem(wxTreeListItem parent,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL)
+ {
+ return DoInsertItem(parent, wxTLI_LAST, text,
+ imageClosed, imageOpened, data);
+ }
+
+ wxTreeListItem InsertItem(wxTreeListItem parent,
+ wxTreeListItem previous,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL)
+ {
+ return DoInsertItem(parent, previous, text,
+ imageClosed, imageOpened, data);
+ }
+
+ wxTreeListItem PrependItem(wxTreeListItem parent,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL)
+ {
+ return DoInsertItem(parent, wxTLI_FIRST, text,
+ imageClosed, imageOpened, data);
+ }
+
+ // Deleting items.
+ void DeleteItem(wxTreeListItem item);
+ void DeleteAllItems();
+
+
+ // Tree navigation
+ // ---------------
+
+ // Return the (never shown) root item.
+ wxTreeListItem GetRootItem() const;
+
+ // The parent item may be invalid for the root-level items.
+ wxTreeListItem GetItemParent(wxTreeListItem item) const;
+
+ // Iterate over the given item children: start by calling GetFirstChild()
+ // and then call GetNextSibling() for as long as it returns valid item.
+ wxTreeListItem GetFirstChild(wxTreeListItem item) const;
+ wxTreeListItem GetNextSibling(wxTreeListItem item) const;
+
+ // Return the first child of the root item, which is also the first item of
+ // the tree in depth-first traversal order.
+ wxTreeListItem GetFirstItem() const { return GetFirstChild(GetRootItem()); }
+
+ // Get item after the given one in the depth-first tree-traversal order.
+ // Calling this function starting with the result of GetFirstItem() allows
+ // iterating over all items in the tree.
+ wxTreeListItem GetNextItem(wxTreeListItem item) const;
+
+
+ // Items attributes
+ // ----------------
+
+ const wxString& GetItemText(wxTreeListItem item, unsigned col = 0) const;
+
+ // The convenience overload below sets the text for the first column.
+ void SetItemText(wxTreeListItem item, unsigned col, const wxString& text);
+ void SetItemText(wxTreeListItem item, const wxString& text)
+ {
+ SetItemText(item, 0, text);
+ }
+
+ // By default the opened image is the same as the normal, closed one (if
+ // it's used at all).
+ void SetItemImage(wxTreeListItem item, int closed, int opened = NO_IMAGE);
+
+ // Retrieve or set the data associated with the item.
+ wxClientData* GetItemData(wxTreeListItem item) const;
+ void SetItemData(wxTreeListItem item, wxClientData* data);
+
+
+ // Expanding and collapsing
+ // ------------------------
+
+ void Expand(wxTreeListItem item);
+ void Collapse(wxTreeListItem item);
+ bool IsExpanded(wxTreeListItem item) const;
+
+
+ // Selection handling
+ // ------------------
+
+ // This function can be used with single selection controls, use
+ // GetSelections() with the multi-selection ones.
+ wxTreeListItem GetSelection() const;
+
+ // This one can be used with either single or multi-selection controls.
+ unsigned GetSelections(wxTreeListItems& selections) const;
+
+ // In single selection mode Select() deselects any other selected items, in
+ // multi-selection case it adds to the selection.
+ void Select(wxTreeListItem item);
+
+ // Can be used in multiple selection mode only, single selected item in the
+ // single selection mode can't be unselected.
+ void Unselect(wxTreeListItem item);
+
+ // Return true if the item is selected, can be used in both single and
+ // multiple selection modes.
+ bool IsSelected(wxTreeListItem item) const;
+
+ // Select or unselect all items, only valid in multiple selection mode.
+ void SelectAll();
+ void UnselectAll();
+
+
+ // Checkbox handling
+ // -----------------
+
+ // Methods in this section can only be used with the controls created with
+ // wxTL_CHECKBOX style.
+
+ // Simple set, unset or query the checked state.
+ void CheckItem(wxTreeListItem item, wxCheckBoxState state = wxCHK_CHECKED);
+ void UncheckItem(wxTreeListItem item) { CheckItem(item, wxCHK_UNCHECKED); }
+
+ // The same but do it recursively for this item itself and its children.
+ void CheckItemRecursively(wxTreeListItem item,
+ wxCheckBoxState state = wxCHK_CHECKED);
+
+ // Update the parent of this item recursively: if this item and all its
+ // siblings are checked, the parent will become checked as well. If this
+ // item and all its siblings are unchecked, the parent will be unchecked.
+ // And if the siblings of this item are not all in the same state, the
+ // parent will be switched to indeterminate state. And then the same logic
+ // will be applied to the parents parent and so on recursively.
+ //
+ // This is typically called when the state of the given item has changed
+ // from EVT_TREELIST_ITEM_CHECKED() handler in the controls which have
+ // wxTL_3STATE flag. Notice that without this flag this function can't work
+ // as it would be unable to set the state of a parent with both checked and
+ // unchecked items so it's only allowed to call it when this flag is set.
+ void UpdateItemParentStateRecursively(wxTreeListItem item);
+
+ // Return the current state.
+ wxCheckBoxState GetCheckedState(wxTreeListItem item) const;
+
+ // Return true if all item children (if any) are in the given state.
+ bool AreAllChildrenInState(wxTreeListItem item,
+ wxCheckBoxState state) const;
+
+
+private:
+ // Common part of all ctors.
+ void Init();
+
+ // Pure virtual method inherited from wxCompositeWindow.
+ virtual wxWindowList GetCompositeWindowParts() const;
+
+ // Implementation of AppendColumn().
+ int DoInsertColumn(const wxString& title,
+ int pos, // May be -1 meaning "append".
+ int width,
+ wxAlignment align,
+ int flags);
+
+ // Common part of {Append,Insert,Prepend}Item().
+ wxTreeListItem DoInsertItem(wxTreeListItem parent,
+ wxTreeListItem previous,
+ const wxString& text,
+ int imageClosed,
+ int imageOpened,
+ wxClientData* data);
+
+ // Send wxTreeListEvent corresponding to the given wxDataViewEvent.
+ //
+ // Also updates the original event "skipped" and "vetoed" flags.
+ void SendEvent(wxEventType evt, wxDataViewEvent& event);
+
+
+ // Called by wxTreeListModel when an item is toggled by the user.
+ void OnItemToggled(wxTreeListItem item, wxCheckBoxState stateOld);
+
+ // Event handlers.
+ void OnSelectionChanged(wxDataViewEvent& event);
+ void OnItemExpanding(wxDataViewEvent& event);
+ void OnItemExpanded(wxDataViewEvent& event);
+ void OnItemActivated(wxDataViewEvent& event);
+ void OnItemContextMenu(wxDataViewEvent& event);
+ void OnSize(wxSizeEvent& event);
+
+ wxDECLARE_EVENT_TABLE();
+
+
+ wxDataViewCtrl* m_view;
+ wxTreeListModel* m_model;
+
+
+ // It calls our inherited protected wxWithImages::GetImage() method.
+ friend class wxTreeListModel;
+
+ wxDECLARE_NO_COPY_CLASS(wxTreeListCtrl);
+};
+
+// ----------------------------------------------------------------------------
+// wxTreeListEvent: event generated by wxTreeListCtrl.
+// ----------------------------------------------------------------------------
+
+class wxTreeListEvent : public wxNotifyEvent
+{
+public:
+ // The item affected by the event.
+ wxTreeListItem GetItem() const { return m_item; }
+
+ // The previous state of the item checkbox for ITEM_CHECKED events only.
+ wxCheckBoxState GetOldCheckedState() const { return m_oldCheckedState; }
+
+
+ virtual wxEvent* Clone() const { return new wxTreeListEvent(*this); }
+
+private:
+ // Ctor is private, only wxTreeListCtrl can create events of this type.
+ wxTreeListEvent(wxEventType evtType,
+ wxTreeListCtrl* treelist,
+ wxTreeListItem item)
+ : wxNotifyEvent(evtType, treelist->GetId()),
+ m_item(item)
+ {
+ SetEventObject(treelist);
+ }
+
+ // Set the checkbox state before this event for ITEM_CHECKED events.
+ void SetOldCheckedState(wxCheckBoxState state)
+ {
+ m_oldCheckedState = state;
+ }
+
+
+ const wxTreeListItem m_item;
+
+ wxCheckBoxState m_oldCheckedState;
+
+ friend class wxTreeListCtrl;
+
+ wxDECLARE_ABSTRACT_CLASS(wxTreeListEvent);
+};
+
+// Event types and event table macros.
+
+typedef void (wxEvtHandler::*wxTreeListEventFunction)(wxTreeListEvent&);
+
+#define wxTreeListEventHandler(func) \
+ wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func)
+
+#define wxEVT_TREELIST_GENERIC(name, id, fn) \
+ wx__DECLARE_EVT1(wxEVT_COMMAND_TREELIST_##name, id, wxTreeListEventHandler(fn))
+
+#define wxDECLARE_TREELIST_EVENT(name) \
+ wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_ADV, \
+ wxEVT_COMMAND_TREELIST_##name, \
+ wxTreeListEvent)
+
+wxDECLARE_TREELIST_EVENT(SELECTION_CHANGED);
+#define EVT_TREELIST_SELECTION_CHANGED(id, fn) \
+ wxEVT_TREELIST_GENERIC(SELECTION_CHANGED, id, fn)
+
+wxDECLARE_TREELIST_EVENT(ITEM_EXPANDING);
+#define EVT_TREELIST_ITEM_EXPANDING(id, fn) \
+ wxEVT_TREELIST_GENERIC(ITEM_EXPANDING, id, fn)
+
+wxDECLARE_TREELIST_EVENT(ITEM_EXPANDED);
+#define EVT_TREELIST_ITEM_EXPANDED(id, fn) \
+ wxEVT_TREELIST_GENERIC(ITEM_EXPANDED, id, fn)
+
+wxDECLARE_TREELIST_EVENT(ITEM_CHECKED);
+#define EVT_TREELIST_ITEM_CHECKED(id, fn) \
+ wxEVT_TREELIST_GENERIC(ITEM_CHECKED, id, fn)
+
+wxDECLARE_TREELIST_EVENT(ITEM_ACTIVATED);
+#define EVT_TREELIST_ITEM_ACTIVATED(id, fn) \
+ wxEVT_TREELIST_GENERIC(ITEM_ACTIVATED, id, fn)
+
+wxDECLARE_TREELIST_EVENT(ITEM_CONTEXT_MENU);
+#define EVT_TREELIST_ITEM_CONTEXT_MENU(id, fn) \
+ wxEVT_TREELIST_GENERIC(ITEM_CONTEXT_MENU, id, fn)
+
+#undef wxDECLARE_TREELIST_EVENT
+
+#endif // wxUSE_TREELISTCTRL
+
+#endif // _WX_TREELIST_H_
diff --git a/include/wx/univ/anybutton.h b/include/wx/univ/anybutton.h
new file mode 100644
index 0000000000..6743fa44f2
--- /dev/null
+++ b/include/wx/univ/anybutton.h
@@ -0,0 +1,33 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/univ/anybutton.h
+// Purpose: wxAnyButton class
+// Author: Vadim Zeitlin
+// Created: 2000-08-15 (extracted from button.h)
+// RCS-ID: $Id$
+// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_UNIV_ANYBUTTON_H_
+#define _WX_UNIV_ANYBUTTON_H_
+
+// ----------------------------------------------------------------------------
+// Common button functionality
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
+{
+public:
+ wxAnyButton() {}
+
+ virtual ~wxAnyButton() {};
+
+protected:
+ // choose the default border for this window
+ virtual wxBorder GetDefaultBorder() const { return wxBORDER_STATIC; }
+
+private:
+ wxDECLARE_NO_COPY_CLASS(wxAnyButton);
+};
+
+#endif // _WX_UNIV_ANYBUTTON_H_
diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h
index 04343ac4fe..ac63fd63c3 100644
--- a/include/wx/univ/combobox.h
+++ b/include/wx/univ/combobox.h
@@ -129,7 +129,9 @@ public:
wxItemContainer::Clear();
}
- bool IsEmpty() const { return wxItemContainer::IsEmpty(); }
+ // See wxComboBoxBase discussion of IsEmpty().
+ bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
+ bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
// wxControlWithItems methods
virtual void DoClear();
diff --git a/include/wx/univ/notebook.h b/include/wx/univ/notebook.h
index 7fa65423be..bbc4250be9 100644
--- a/include/wx/univ/notebook.h
+++ b/include/wx/univ/notebook.h
@@ -86,7 +86,7 @@ public:
wxNotebookPage *pPage,
const wxString& strText,
bool bSelect = false,
- int imageId = -1);
+ int imageId = NO_IMAGE);
// style tests
// -----------
@@ -130,7 +130,6 @@ protected:
void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
// resizing
- virtual wxSize DoGetBestClientSize() const;
virtual void DoMoveWindow(int x, int y, int width, int height);
virtual void DoSetSize(int x, int y,
int width, int height,
@@ -188,7 +187,7 @@ protected:
// return true if the tab has an associated image
bool HasImage(int page) const
- { return m_imageList && m_images[page] != -1; }
+ { return HasImageList() && m_images[page] != -1; }
// get the part of the notebook reserved for the pages (slightly larger
// than GetPageRect() as we draw a border and leave marginin between)
diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index ee5870c5c9..b47c7d8f27 100644
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -802,6 +802,7 @@
//
// Recommended setting: 1
#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl
+#define wxUSE_BANNERWINDOW 1 // wxBannerWindow
#define wxUSE_BUTTON 1 // wxButton
#define wxUSE_BMPBUTTON 1 // wxBitmapButton
#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl
@@ -839,6 +840,7 @@
#define wxUSE_TEXTCTRL 1 // wxTextCtrl
#define wxUSE_TOGGLEBTN 1 // requires wxButton
#define wxUSE_TREECTRL 1 // wxTreeCtrl
+#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl
// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
// below either wxStatusBar95 or a generic wxStatusBar will be used.
diff --git a/include/wx/univ/window.h b/include/wx/univ/window.h
index d5aa30e4ba..1d21f3b716 100644
--- a/include/wx/univ/window.h
+++ b/include/wx/univ/window.h
@@ -237,12 +237,6 @@ protected:
// draw the controls contents
virtual void DoDraw(wxControlRenderer *renderer);
- // calculate the best size for the client area of the window: default
- // implementation of DoGetBestSize() uses this method and adds the border
- // width to the result
- virtual wxSize DoGetBestClientSize() const;
- virtual wxSize DoGetBestSize() const;
-
// override the base class method to return the size of the window borders
virtual wxSize DoGetBorderSize() const;
diff --git a/include/wx/withimages.h b/include/wx/withimages.h
new file mode 100644
index 0000000000..5d38ce410d
--- /dev/null
+++ b/include/wx/withimages.h
@@ -0,0 +1,97 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/withimages.h
+// Purpose: Declaration of a simple wxWithImages class.
+// Author: Vadim Zeitlin
+// Created: 2011-08-17
+// RCS-ID: $Id: wxhead.h,v 1.12 2010-04-22 12:44:51 zeitlin Exp $
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_WITHIMAGES_H_
+#define _WX_WITHIMAGES_H_
+
+#include "wx/defs.h"
+#include "wx/icon.h"
+#include "wx/imaglist.h"
+
+// ----------------------------------------------------------------------------
+// wxWithImages: mix-in class providing access to wxImageList.
+// ----------------------------------------------------------------------------
+
+class WXDLLIMPEXP_CORE wxWithImages
+{
+public:
+ enum
+ {
+ NO_IMAGE = -1
+ };
+
+ wxWithImages()
+ {
+ m_imageList = NULL;
+ m_ownsImageList = false;
+ }
+
+ virtual ~wxWithImages()
+ {
+ FreeIfNeeded();
+ }
+
+ // Sets the image list to use, it is *not* deleted by the control.
+ virtual void SetImageList(wxImageList* imageList)
+ {
+ FreeIfNeeded();
+ m_imageList = imageList;
+ }
+
+ // As SetImageList() but we will delete the image list ourselves.
+ void AssignImageList(wxImageList* imageList)
+ {
+ SetImageList(imageList);
+ m_ownsImageList = true;
+ }
+
+ // Get pointer (may be NULL) to the associated image list.
+ wxImageList* GetImageList() const { return m_imageList; }
+
+protected:
+ // Return true if we have a valid image list.
+ bool HasImageList() const { return m_imageList != NULL; }
+
+ // Return the image with the given index from the image list.
+ //
+ // If there is no image list or if index == NO_IMAGE, silently returns
+ // wxNullIcon.
+ wxIcon GetImage(int iconIndex) const
+ {
+ return m_imageList && iconIndex != NO_IMAGE
+ ? m_imageList->GetIcon(iconIndex)
+ : wxNullIcon;
+ }
+
+private:
+ // Free the image list if necessary, i.e. if we own it.
+ void FreeIfNeeded()
+ {
+ if ( m_ownsImageList )
+ {
+ delete m_imageList;
+ m_imageList = NULL;
+
+ // We don't own it any more.
+ m_ownsImageList = false;
+ }
+ }
+
+
+ // The associated image list or NULL.
+ wxImageList* m_imageList;
+
+ // False by default, if true then we delete m_imageList.
+ bool m_ownsImageList;
+
+ wxDECLARE_NO_COPY_CLASS(wxWithImages);
+};
+
+#endif // _WX_WITHIMAGES_H_
diff --git a/include/wx/xrc/xh_all.h b/include/wx/xrc/xh_all.h
index 21bd620de8..7825a72b31 100644
--- a/include/wx/xrc/xh_all.h
+++ b/include/wx/xrc/xh_all.h
@@ -15,6 +15,7 @@
// Existing handlers:
#include "wx/xrc/xh_animatctrl.h"
+#include "wx/xrc/xh_bannerwindow.h"
#include "wx/xrc/xh_bmp.h"
#include "wx/xrc/xh_bmpbt.h"
#include "wx/xrc/xh_bmpcbox.h"
diff --git a/include/wx/xrc/xh_bannerwindow.h b/include/wx/xrc/xh_bannerwindow.h
new file mode 100644
index 0000000000..bc4a53d381
--- /dev/null
+++ b/include/wx/xrc/xh_bannerwindow.h
@@ -0,0 +1,31 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/xrc/xh_bannerwindow.h
+// Purpose: Declaration of wxBannerWindow XRC handler.
+// Author: Vadim Zeitlin
+// Created: 2011-08-16
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_BANNERWINDOW_H_
+#define _WX_XH_BANNERWINDOW_H_
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC && wxUSE_BANNERWINDOW
+
+class WXDLLIMPEXP_XRC wxBannerWindowXmlHandler : public wxXmlResourceHandler
+{
+public:
+ wxBannerWindowXmlHandler();
+
+ virtual wxObject *DoCreateResource();
+ virtual bool CanHandle(wxXmlNode *node);
+
+ wxDECLARE_DYNAMIC_CLASS(wxBannerWindowXmlHandler);
+};
+
+#endif // wxUSE_XRC && wxUSE_BANNERWINDOW
+
+#endif // _WX_XH_BANNERWINDOW_H_
diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index f7c6867929..1d226c11af 100644
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -558,6 +558,9 @@ protected:
wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
wxWindow *windowToUse = NULL);
+ // Gets a direction, complains if the value is invalid.
+ wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT);
+
// Gets a bitmap.
wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
const wxArtClient& defaultArtClient = wxART_OTHER,
diff --git a/interface/wx/accel.h b/interface/wx/accel.h
index 974731fab6..580d30033d 100644
--- a/interface/wx/accel.h
+++ b/interface/wx/accel.h
@@ -16,13 +16,16 @@ enum wxAcceleratorEntryFlags
/** hold Alt key down */
wxACCEL_ALT,
- /** hold Ctrl key down */
+ /** hold Ctrl key down, corresponds to Command key on OS X */
wxACCEL_CTRL,
/** hold Shift key down */
wxACCEL_SHIFT,
- /** Command key on OS X; identic to wxACCEL_CTRL on other platforms. */
+ /** corresponds to real Ctrl key on OS X, identic to @c wxACCEL_CTRL on other platforms */
+ wxACCEL_RAW_CTRL,
+
+ /** deprecated, identic to @c wxACCEL_CTRL on all platforms. */
wxACCEL_CMD
};
diff --git a/interface/wx/bannerwindow.h b/interface/wx/bannerwindow.h
new file mode 100644
index 0000000000..e91073ff3a
--- /dev/null
+++ b/interface/wx/bannerwindow.h
@@ -0,0 +1,151 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: interface/wx/bannerwindow.h
+// Purpose: wxBannerWindow class documentation
+// Author: Vadim Zeitlin
+// Created: 2011-08-16
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ A simple banner window showing either a bitmap or text.
+
+ Banner windows can be used to present some overview of the current window
+ contents to the user in an aesthetically pleasant way. They are typically
+ positioned along the left or top edge of the window (although this class
+ also supports right- and bottom-aligned banners) and show either a bitmap
+ with a logo or a few lines of text on a gradient-filled background.
+
+ Using this class is very simple, e.g.:
+ @code
+ MyFrame::MyFrame(...)
+ {
+ ... create the frame itself ...
+
+ // Create and initialize the banner.
+ wxBannerWindow* banner = new wxBannerWindow(this, wxTOP);
+ banner->SetText("Welcome to my wonderful program",
+ " Before doing anything else, you need to connect to "
+ "the online server.\n"
+ " Please enter your credentials in the controls below.");
+
+ // And position it along the left edge of the window.
+ wxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(banner, wxSizerFlags().Expand());
+
+ ... add the rest of the window contents to the same sizer ...
+
+ SetSizerAndFit(sizer);
+ }
+ @endcode
+
+ This class is currently implemented generically and so looks the same under
+ all platforms.
+
+ @library{wxadv}
+ @category{miscwnd}
+ @genericAppearance{bannerwindow.png}
+
+ @since 2.9.3
+ */
+class wxBannerWindow : public wxWindow
+{
+public:
+ /**
+ Default constructor, use Create() later.
+
+ This constructor is only used for two-step creation, if possible,
+ prefer using the constructor below directly instead of using this one
+ and calling Create() later.
+ */
+ wxBannerWindow();
+
+ /**
+ Convenient constructor that should be used in the majority of cases.
+
+ The only really important arguments of the full constructor below are
+ @a parent and @a dir so this class provides a convenient constructor
+ taking only them.
+
+ The banner orientation changes how the text in it is displayed and also
+ defines where is the bitmap truncated if it's too big to fit but doesn't
+ do anything for the banner position, this is supposed to be taken care
+ of in the usual way, e.g. using sizers.
+ */
+ wxBannerWindow(wxWindow* parent, wxDirection dir = wxLEFT);
+
+ /**
+ Full constructor provided for consistency with the other classes only.
+
+ Prefer to use the shorter constructor documented above. You should
+ rarely, if ever, need to use non-default values for any other
+ parameters: as the banner window doesn't generate any events, its
+ identifier is not particularly useful; its position and size will be
+ almost always managed by the containing sizer and it doesn't have any
+ specific styles. So only the parent and the banner direction need to be
+ specified.
+ */
+ wxBannerWindow(wxWindow* parent,
+ wxWindowID winid,
+ wxDirection dir = wxLEFT,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxBannerWindowNameStr);
+
+ /**
+ Really create the banner window for the objects created using the
+ default constructor.
+
+ It's an error to call Create() for the objects created using
+ non-default constructor.
+ */
+ bool Create(wxWindow* parent,
+ wxWindowID winid,
+ wxDirection dir = wxLEFT,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = 0,
+ const wxString& name = wxBannerWindowNameStr);
+
+
+ /**
+ Provide the bitmap to use as background.
+
+ Notice that the bitmap should be big enough to always cover the entire
+ banner, e.g. for a horizontal banner with wxTOP style its width should
+ be bigger than any reasonable window size.
+
+ For wxLEFT orientation the bitmap is truncated from the top, for wxTOP
+ and wxBOTTOM -- from the right and for wxRIGHT -- from the bottom, so
+ put the most important part of the bitmap information in the opposite
+ direction.
+
+ If no valid background bitmap is specified, the banner draws gradient
+ background but if a valid bitmap is given here, the gradient is not
+ draw and the start and end colours specified for it are ignored.
+
+ @param bmp Bitmap to use as background. May be invalid to indicate
+ that no background bitmap should be used.
+ */
+ void SetBitmap(const wxBitmap& bmp);
+
+ /**
+ Set the text to display.
+
+ This is mutually exclusive with SetBitmap().
+
+ Title is rendered in bold and should be single line, message can have
+ multiple lines but is not wrapped automatically, include explicit line
+ breaks in the string if you want to have multiple lines.
+ */
+ void SetText(const wxString& title, const wxString& message);
+
+ /**
+ Set the colours between which the gradient runs.
+
+ The gradient colours are ignored if SetBitmap() is used.
+ */
+ void SetGradient(const wxColour& start, const wxColour& end);
+};
diff --git a/interface/wx/bitmap.h b/interface/wx/bitmap.h
index cf62947f78..4874563bd4 100644
--- a/interface/wx/bitmap.h
+++ b/interface/wx/bitmap.h
@@ -276,7 +276,7 @@ public:
In wxPerl use Wx::Bitmap->newFromBits(bits, width, height, depth).
@endWxPerlOnly
*/
- wxBitmap(const char bits[], int width, int height, int depth = 1);
+ wxBitmap(const char* bits[], int width, int height, int depth = 1);
/**
Creates a new bitmap. A depth of ::wxBITMAP_SCREEN_DEPTH indicates the
diff --git a/interface/wx/bookctrl.h b/interface/wx/bookctrl.h
index 450cd6d4eb..06092c4eaf 100644
--- a/interface/wx/bookctrl.h
+++ b/interface/wx/bookctrl.h
@@ -30,6 +30,12 @@
class wxBookCtrlBase : public wxControl
{
public:
+ enum
+ {
+ /// Symbolic constant indicating that no image should be used.
+ NO_IMAGE = -1
+ };
+
/**
Default ctor.
*/
@@ -243,7 +249,7 @@ public:
@see InsertPage()
*/
virtual bool AddPage(wxWindow* page, const wxString& text,
- bool select = false, int imageId = wxNOT_FOUND);
+ bool select = false, int imageId = NO_IMAGE);
/**
Deletes all pages.
@@ -280,7 +286,7 @@ public:
wxWindow* page,
const wxString& text,
bool select = false,
- int imageId = wxNOT_FOUND) = 0;
+ int imageId = NO_IMAGE) = 0;
/**
Deletes the specified page, without deleting the associated window.
diff --git a/interface/wx/button.h b/interface/wx/button.h
index 697fc73f6c..f876694b2a 100644
--- a/interface/wx/button.h
+++ b/interface/wx/button.h
@@ -6,6 +6,11 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+
+#define wxBU_EXACTFIT 0x0001
+#define wxBU_NOTEXT 0x0002
+
+
/**
@class wxButton
diff --git a/interface/wx/choice.h b/interface/wx/choice.h
index fff0dfbfde..dba1a3bdd1 100644
--- a/interface/wx/choice.h
+++ b/interface/wx/choice.h
@@ -184,5 +184,15 @@ public:
anything under other platforms.
*/
virtual void SetColumns(int n = 1);
+
+ virtual bool IsSorted() const;
+
+ virtual unsigned int GetCount() const ;
+ virtual int GetSelection() const ;
+ virtual void SetSelection(int n);
+
+ virtual int FindString(const wxString& s, bool bCase = false) const;
+ virtual wxString GetString(unsigned int n) const ;
+ virtual void SetString(unsigned int pos, const wxString& s);
};
diff --git a/interface/wx/collpane.h b/interface/wx/collpane.h
index 9a82bdc0ad..2ad1b46637 100644
--- a/interface/wx/collpane.h
+++ b/interface/wx/collpane.h
@@ -6,6 +6,9 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+#define wxCP_DEFAULT_STYLE (wxTAB_TRAVERSAL | wxNO_BORDER)
+#define wxCP_NO_TLW_RESIZE (0x0002)
+
/**
@class wxCollapsiblePaneEvent
@@ -41,7 +44,7 @@ public:
void SetCollapsed(bool collapsed);
};
-
+wxEventType wxEVT_COMMAND_COLLPANE_CHANGED;
/**
@class wxCollapsiblePane
@@ -179,4 +182,3 @@ public:
*/
bool IsExpanded() const;
};
-
diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h
index 602916cccf..e77f8a8fd2 100644
--- a/interface/wx/combobox.h
+++ b/interface/wx/combobox.h
@@ -224,6 +224,39 @@ public:
*/
virtual long GetInsertionPoint() const;
+ /**
+ IsEmpty() is not available in this class.
+
+ This method is documented here only to notice that it can't be used
+ with this class because of the ambiguity between the methods with the
+ same name inherited from wxItemContainer and wxTextEntry base classes.
+
+ Because of this, any attempt to call it results in a compilation error
+ and you should use either IsListEmpty() or IsTextEmpty() depending on
+ what exactly do you want to test.
+ */
+ bool IsEmpty() const;
+
+ /**
+ Returns true if the list of combobox choices is empty.
+
+ Use this method instead of (not available in this class) IsEmpty() to
+ test if the list of items is empty.
+
+ @since 2.9.3
+ */
+ bool IsListEmpty() const;
+
+ /**
+ Returns true if the text of the combobox is empty.
+
+ Use this method instead of (not available in this class) IsEmpty() to
+ test if the text currently entered into the combobox is empty.
+
+ @since 2.9.3
+ */
+ bool IsTextEmpty() const;
+
/**
Same as wxTextEntry::SetSelection().
diff --git a/interface/wx/dataview.h b/interface/wx/dataview.h
index 9c24be7d76..0c06dae862 100644
--- a/interface/wx/dataview.h
+++ b/interface/wx/dataview.h
@@ -1016,13 +1016,35 @@ public:
*/
wxDataViewModel* GetModel();
+ /**
+ Returns the number of currently selected items.
+
+ This method may be called for both the controls with single and
+ multiple selections and returns the number of selected item, possibly
+ 0, in any case.
+
+ @since 2.9.3
+ */
+ virtual int GetSelectedItemsCount() const;
+
/**
Returns first selected item or an invalid item if none is selected.
+
+ This method may be called for both the controls with single and
+ multiple selections but returns an invalid item if more than one item
+ is selected in the latter case, use HasSelection() to determine if
+ there are any selected items when using multiple selection.
*/
virtual wxDataViewItem GetSelection() const;
/**
Fills @a sel with currently selected items and returns their number.
+
+ This method may be called for both the controls with single and
+ multiple selections. In the single selection case it returns the array
+ with at most one element in it.
+
+ @see GetSelectedItemsCount()
*/
virtual int GetSelections(wxDataViewItemArray& sel) const;
@@ -1032,6 +1054,20 @@ public:
*/
virtual wxDataViewColumn* GetSortingColumn() const;
+ /**
+ Returns true if any items are currently selected.
+
+ This method may be called for both the controls with single and
+ multiple selections.
+
+ Calling this method is equivalent to calling GetSelectedItemsCount()
+ and comparing its result with 0 but is more clear and might also be
+ implemented more efficiently in the future.
+
+ @since 2.9.3
+ */
+ bool HasSelection() const;
+
/**
Hittest.
*/
diff --git a/interface/wx/dc.h b/interface/wx/dc.h
index 607830fa3a..9d77e88e3e 100644
--- a/interface/wx/dc.h
+++ b/interface/wx/dc.h
@@ -561,7 +561,7 @@ public:
/**
@overload
*/
- void DrawRotatedText(const wxString& text, const wxPoint&,
+ void DrawRotatedText(const wxString& text, const wxPoint& point,
double angle);
/**
@@ -715,7 +715,7 @@ public:
@overload
*/
bool FloodFill(const wxPoint& pt, const wxColour& col,
- int style = wxFLOOD_SURFACE);
+ wxFloodFillStyle style = wxFLOOD_SURFACE);
/**
Displays a cross hair using the current pen. This is a vertical and
diff --git a/interface/wx/dcgraph.h b/interface/wx/dcgraph.h
index 5d086485c1..cd6a5ea3a3 100644
--- a/interface/wx/dcgraph.h
+++ b/interface/wx/dcgraph.h
@@ -35,6 +35,11 @@ public:
*/
wxGCDC( const wxPrinterDC& dc );
+ /**
+ Construct a wxGCDC from an existing grtaphics context.
+ */
+ wxGCDC(wxGraphicsContext* context);
+
/**
Constructs a wxGCDC from a wxEnhMetaFileDC.
@@ -46,9 +51,17 @@ public:
*/
wxGCDC( const wxEnhMetaFileDC& dc );
+ wxGCDC();
+ virtual ~wxGCDC();
/**
Retrieves associated wxGraphicsContext
*/
wxGraphicsContext* GetGraphicsContext() const;
+
+ /**
+ Set the grpahics context to be used for this wxGCDC.
+ */
+ void SetGraphicsContext( wxGraphicsContext* ctx );
+
};
diff --git a/interface/wx/defs.h b/interface/wx/defs.h
index 2513b04c38..e8ce18bf23 100644
--- a/interface/wx/defs.h
+++ b/interface/wx/defs.h
@@ -144,6 +144,330 @@ enum wxBorder
wxBORDER_MASK = 0x1f200000
};
+/* ---------------------------------------------------------------------------- */
+/* Window style flags */
+/* ---------------------------------------------------------------------------- */
+
+/*
+ * Values are chosen so they can be |'ed in a bit list.
+ * Some styles are used across more than one group,
+ * so the values mustn't clash with others in the group.
+ * Otherwise, numbers can be reused across groups.
+ */
+
+/*
+ Summary of the bits used by various styles.
+
+ High word, containing styles which can be used with many windows:
+
+ +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|
+ +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
+ | | | | | | | | | | | | | | | |
+ | | | | | | | | | | | | | | | \_ wxFULL_REPAINT_ON_RESIZE
+ | | | | | | | | | | | | | | \____ wxPOPUP_WINDOW
+ | | | | | | | | | | | | | \_______ wxWANTS_CHARS
+ | | | | | | | | | | | | \__________ wxTAB_TRAVERSAL
+ | | | | | | | | | | | \_____________ wxTRANSPARENT_WINDOW
+ | | | | | | | | | | \________________ wxBORDER_NONE
+ | | | | | | | | | \___________________ wxCLIP_CHILDREN
+ | | | | | | | | \______________________ wxALWAYS_SHOW_SB
+ | | | | | | | \_________________________ wxBORDER_STATIC
+ | | | | | | \____________________________ wxBORDER_SIMPLE
+ | | | | | \_______________________________ wxBORDER_RAISED
+ | | | | \__________________________________ wxBORDER_SUNKEN
+ | | | \_____________________________________ wxBORDER_{DOUBLE,THEME}
+ | | \________________________________________ wxCAPTION/wxCLIP_SIBLINGS
+ | \___________________________________________ wxHSCROLL
+ \______________________________________________ wxVSCROLL
+
+
+ Low word style bits is class-specific meaning that the same bit can have
+ different meanings for different controls (e.g. 0x10 is wxCB_READONLY
+ meaning that the control can't be modified for wxComboBox but wxLB_SORT
+ meaning that the control should be kept sorted for wxListBox, while
+ wxLB_SORT has a different value -- and this is just fine).
+ */
+
+/*
+ * Window (Frame/dialog/subwindow/panel item) style flags
+ */
+#define wxVSCROLL 0x80000000
+#define wxHSCROLL 0x40000000
+#define wxCAPTION 0x20000000
+
+/* New styles (border styles are now in their own enum) */
+#define wxDOUBLE_BORDER wxBORDER_DOUBLE
+#define wxSUNKEN_BORDER wxBORDER_SUNKEN
+#define wxRAISED_BORDER wxBORDER_RAISED
+#define wxBORDER wxBORDER_SIMPLE
+#define wxSIMPLE_BORDER wxBORDER_SIMPLE
+#define wxSTATIC_BORDER wxBORDER_STATIC
+#define wxNO_BORDER wxBORDER_NONE
+
+/* wxALWAYS_SHOW_SB: instead of hiding the scrollbar when it is not needed, */
+/* disable it - but still show (see also wxLB_ALWAYS_SB style) */
+/* */
+/* NB: as this style is only supported by wxUniversal and wxMSW so far */
+#define wxALWAYS_SHOW_SB 0x00800000
+
+/* Clip children when painting, which reduces flicker in e.g. frames and */
+/* splitter windows, but can't be used in a panel where a static box must be */
+/* 'transparent' (panel paints the background for it) */
+#define wxCLIP_CHILDREN 0x00400000
+
+/* Note we're reusing the wxCAPTION style because we won't need captions */
+/* for subwindows/controls */
+#define wxCLIP_SIBLINGS 0x20000000
+
+#define wxTRANSPARENT_WINDOW 0x00100000
+
+/* Add this style to a panel to get tab traversal working outside of dialogs */
+/* (on by default for wxPanel, wxDialog, wxScrolledWindow) */
+#define wxTAB_TRAVERSAL 0x00080000
+
+/* Add this style if the control wants to get all keyboard messages (under */
+/* Windows, it won't normally get the dialog navigation key events) */
+#define wxWANTS_CHARS 0x00040000
+
+/* Make window retained (Motif only, see src/generic/scrolwing.cpp)
+ * This is non-zero only under wxMotif, to avoid a clash with wxPOPUP_WINDOW
+ * on other platforms
+ */
+
+#ifdef __WXMOTIF__
+#define wxRETAINED 0x00020000
+#else
+#define wxRETAINED 0x00000000
+#endif
+#define wxBACKINGSTORE wxRETAINED
+
+/* set this flag to create a special popup window: it will be always shown on */
+/* top of other windows, will capture the mouse and will be dismissed when the */
+/* mouse is clicked outside of it or if it loses focus in any other way */
+#define wxPOPUP_WINDOW 0x00020000
+
+/* force a full repaint when the window is resized (instead of repainting just */
+/* the invalidated area) */
+#define wxFULL_REPAINT_ON_RESIZE 0x00010000
+
+/* obsolete: now this is the default behaviour */
+/* */
+/* don't invalidate the whole window (resulting in a PAINT event) when the */
+/* window is resized (currently, makes sense for wxMSW only) */
+#define wxNO_FULL_REPAINT_ON_RESIZE 0
+
+/* A mask which can be used to filter (out) all wxWindow-specific styles.
+ */
+#define wxWINDOW_STYLE_MASK \
+ (wxVSCROLL|wxHSCROLL|wxBORDER_MASK|wxALWAYS_SHOW_SB|wxCLIP_CHILDREN| \
+ wxCLIP_SIBLINGS|wxTRANSPARENT_WINDOW|wxTAB_TRAVERSAL|wxWANTS_CHARS| \
+ wxRETAINED|wxPOPUP_WINDOW|wxFULL_REPAINT_ON_RESIZE)
+
+/*
+ * Extra window style flags (use wxWS_EX prefix to make it clear that they
+ * should be passed to wxWindow::SetExtraStyle(), not SetWindowStyle())
+ */
+
+/* by default, TransferDataTo/FromWindow() only work on direct children of the */
+/* window (compatible behaviour), set this flag to make them recursively */
+/* descend into all subwindows */
+#define wxWS_EX_VALIDATE_RECURSIVELY 0x00000001
+
+/* wxCommandEvents and the objects of the derived classes are forwarded to the */
+/* parent window and so on recursively by default. Using this flag for the */
+/* given window allows to block this propagation at this window, i.e. prevent */
+/* the events from being propagated further upwards. The dialogs have this */
+/* flag on by default. */
+#define wxWS_EX_BLOCK_EVENTS 0x00000002
+
+/* don't use this window as an implicit parent for the other windows: this must */
+/* be used with transient windows as otherwise there is the risk of creating a */
+/* dialog/frame with this window as a parent which would lead to a crash if the */
+/* parent is destroyed before the child */
+#define wxWS_EX_TRANSIENT 0x00000004
+
+/* don't paint the window background, we'll assume it will */
+/* be done by a theming engine. This is not yet used but could */
+/* possibly be made to work in the future, at least on Windows */
+#define wxWS_EX_THEMED_BACKGROUND 0x00000008
+
+/* this window should always process idle events */
+#define wxWS_EX_PROCESS_IDLE 0x00000010
+
+/* this window should always process UI update events */
+#define wxWS_EX_PROCESS_UI_UPDATES 0x00000020
+
+/* Draw the window in a metal theme on Mac */
+#define wxFRAME_EX_METAL 0x00000040
+#define wxDIALOG_EX_METAL 0x00000040
+
+/* Use this style to add a context-sensitive help to the window (currently for */
+/* Win32 only and it doesn't work if wxMINIMIZE_BOX or wxMAXIMIZE_BOX are used) */
+#define wxWS_EX_CONTEXTHELP 0x00000080
+
+/* synonyms for wxWS_EX_CONTEXTHELP for compatibility */
+#define wxFRAME_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP
+#define wxDIALOG_EX_CONTEXTHELP wxWS_EX_CONTEXTHELP
+
+/* Create a window which is attachable to another top level window */
+#define wxFRAME_DRAWER 0x0020
+
+/*
+ * MDI parent frame style flags
+ * Can overlap with some of the above.
+ */
+
+#define wxFRAME_NO_WINDOW_MENU 0x0100
+
+/*
+ * wxMenuBar style flags
+ */
+/* use native docking */
+#define wxMB_DOCKABLE 0x0001
+
+/*
+ * wxMenu style flags
+ */
+#define wxMENU_TEAROFF 0x0001
+
+/*
+ * Apply to all panel items
+ */
+#define wxCOLOURED 0x0800
+#define wxFIXED_LENGTH 0x0400
+
+/*
+ * Styles for wxListBox
+ */
+#define wxLB_SORT 0x0010
+#define wxLB_SINGLE 0x0020
+#define wxLB_MULTIPLE 0x0040
+#define wxLB_EXTENDED 0x0080
+/* wxLB_OWNERDRAW is Windows-only */
+#define wxLB_NEEDED_SB 0x0000
+#define wxLB_OWNERDRAW 0x0100
+#define wxLB_ALWAYS_SB 0x0200
+#define wxLB_NO_SB 0x0400
+#define wxLB_HSCROLL wxHSCROLL
+/* always show an entire number of rows */
+#define wxLB_INT_HEIGHT 0x0800
+
+/*
+ * wxComboBox style flags
+ */
+#define wxCB_SIMPLE 0x0004
+#define wxCB_SORT 0x0008
+#define wxCB_READONLY 0x0010
+#define wxCB_DROPDOWN 0x0020
+
+/*
+ * wxRadioBox style flags
+ */
+/* should we number the items from left to right or from top to bottom in a 2d */
+/* radiobox? */
+#define wxRA_LEFTTORIGHT 0x0001
+#define wxRA_TOPTOBOTTOM 0x0002
+
+/* New, more intuitive names to specify majorDim argument */
+#define wxRA_SPECIFY_COLS wxHORIZONTAL
+#define wxRA_SPECIFY_ROWS wxVERTICAL
+
+/* Old names for compatibility */
+#define wxRA_HORIZONTAL wxHORIZONTAL
+#define wxRA_VERTICAL wxVERTICAL
+#define wxRA_USE_CHECKBOX 0x0010 /* alternative native subcontrols (wxPalmOS) */
+
+/*
+ * wxRadioButton style flag
+ */
+#define wxRB_GROUP 0x0004
+#define wxRB_SINGLE 0x0008
+#define wxRB_USE_CHECKBOX 0x0010 /* alternative native control (wxPalmOS) */
+
+/*
+ * wxScrollBar flags
+ */
+#define wxSB_HORIZONTAL wxHORIZONTAL
+#define wxSB_VERTICAL wxVERTICAL
+
+/*
+ * wxSpinButton flags.
+ * Note that a wxSpinCtrl is sometimes defined as a wxTextCtrl, and so the
+ * flags shouldn't overlap with wxTextCtrl flags that can be used for a single
+ * line controls (currently we reuse wxTE_CHARWRAP and wxTE_RICH2 neither of
+ * which makes sense for them).
+ */
+#define wxSP_HORIZONTAL wxHORIZONTAL /* 4 */
+#define wxSP_VERTICAL wxVERTICAL /* 8 */
+#define wxSP_ARROW_KEYS 0x4000
+#define wxSP_WRAP 0x8000
+
+/*
+ * wxTabCtrl flags
+ */
+#define wxTC_RIGHTJUSTIFY 0x0010
+#define wxTC_FIXEDWIDTH 0x0020
+#define wxTC_TOP 0x0000 /* default */
+#define wxTC_LEFT 0x0020
+#define wxTC_RIGHT 0x0040
+#define wxTC_BOTTOM 0x0080
+#define wxTC_MULTILINE 0x0200 /* == wxNB_MULTILINE */
+#define wxTC_OWNERDRAW 0x0400
+
+/*
+ * wxStaticBitmap flags
+ */
+#define wxBI_EXPAND wxEXPAND
+
+/*
+ * wxStaticLine flags
+ */
+#define wxLI_HORIZONTAL wxHORIZONTAL
+#define wxLI_VERTICAL wxVERTICAL
+
+
+/*
+ * extended dialog specifiers. these values are stored in a different
+ * flag and thus do not overlap with other style flags. note that these
+ * values do not correspond to the return values of the dialogs (for
+ * those values, look at the wxID_XXX defines).
+ */
+
+/* wxCENTRE already defined as 0x00000001 */
+#define wxYES 0x00000002
+#define wxOK 0x00000004
+#define wxNO 0x00000008
+#define wxYES_NO (wxYES | wxNO)
+#define wxCANCEL 0x00000010
+#define wxAPPLY 0x00000020
+#define wxCLOSE 0x00000040
+
+#define wxOK_DEFAULT 0x00000000 /* has no effect (default) */
+#define wxYES_DEFAULT 0x00000000 /* has no effect (default) */
+#define wxNO_DEFAULT 0x00000080 /* only valid with wxYES_NO */
+#define wxCANCEL_DEFAULT 0x80000000 /* only valid with wxCANCEL */
+
+#define wxICON_EXCLAMATION 0x00000100
+#define wxICON_HAND 0x00000200
+#define wxICON_WARNING wxICON_EXCLAMATION
+#define wxICON_ERROR wxICON_HAND
+#define wxICON_QUESTION 0x00000400
+#define wxICON_INFORMATION 0x00000800
+#define wxICON_STOP wxICON_HAND
+#define wxICON_ASTERISK wxICON_INFORMATION
+
+#define wxFORWARD 0x00001000
+#define wxBACKWARD 0x00002000
+#define wxRESET 0x00004000
+#define wxHELP 0x00008000
+#define wxMORE 0x00010000
+#define wxSETUP 0x00020000
+#define wxICON_NONE 0x00040000
+
+#define wxICON_MASK \
+ (wxICON_EXCLAMATION|wxICON_HAND|wxICON_QUESTION|wxICON_INFORMATION|wxICON_NONE)
+
/**
Background styles.
@@ -653,20 +977,19 @@ enum wxKeyModifier
{
wxMOD_NONE = 0x0000,
wxMOD_ALT = 0x0001,
+ /** Ctlr Key, corresponds to Command key on OS X */
wxMOD_CONTROL = 0x0002,
wxMOD_ALTGR = wxMOD_ALT | wxMOD_CONTROL,
wxMOD_SHIFT = 0x0004,
wxMOD_META = 0x0008,
wxMOD_WIN = wxMOD_META,
-
- /**
- Notice that @c wxMOD_CMD should be used instead of @c wxMOD_CONTROL
- in portable code to account for the fact that although
- @c Control modifier exists under Mac OS, it is not used for the same
- purpose as under Windows or Unix there while the special Mac-specific
- @c Command modifier is used in exactly the same way.
- */
- wxMOD_CMD = wxMOD_META,
+
+ /** used to describe the true Ctrl Key under OSX,
+ identic to @c wxMOD_CONTROL on other platforms */
+ wxMOD_RAW_CONTROL,
+
+ /** deprecated, identic to @c wxMOD_CONTROL on all platforms */
+ wxMOD_CMD = wxMOD_CONTROL,
wxMOD_ALL = 0xffff
};
@@ -847,6 +1170,24 @@ enum wxUpdateUI
// constants
// ----------------------------------------------------------------------------
+/**
+ Top level window styles common to wxFrame and wxDialog
+*/
+
+#define wxSTAY_ON_TOP 0x8000
+#define wxICONIZE 0x4000
+#define wxMINIMIZE wxICONIZE
+#define wxMAXIMIZE 0x2000
+#define wxCLOSE_BOX 0x1000
+
+#define wxSYSTEM_MENU 0x0800
+#define wxMINIMIZE_BOX 0x0400
+#define wxMAXIMIZE_BOX 0x0200
+
+#define wxTINY_CAPTION 0x0080 // clashes with wxNO_DEFAULT
+#define wxRESIZE_BORDER 0x0040
+
+
/**
C99-like sized MIN/MAX constants for all integer types.
diff --git a/interface/wx/filepicker.h b/interface/wx/filepicker.h
index 95155a17dd..89466aaf09 100644
--- a/interface/wx/filepicker.h
+++ b/interface/wx/filepicker.h
@@ -37,6 +37,9 @@
existing file.
@style{wxFLP_CHANGE_DIR}
Change current working directory on each user file selection change.
+ @style{wxFLP_SMALL}
+ Use smaller version of the control with a small "..." button instead
+ of the normal "Browse" one. This flag is new since wxWidgets 2.9.3.
@endStyleTable
@@ -161,6 +164,9 @@ public:
support its absence.
@style{wxDIRP_CHANGE_DIR}
Change current working directory on each user directory selection change.
+ @style{wxDIRP_SMALL}
+ Use smaller version of the control with a small "..." button instead
+ of the normal "Browse" one. This flag is new since wxWidgets 2.9.3.
@endStyleTable
@beginEventEmissionTable{wxFileDirPickerEvent}
diff --git a/interface/wx/gdicmn.h b/interface/wx/gdicmn.h
index b660421374..c26755c304 100644
--- a/interface/wx/gdicmn.h
+++ b/interface/wx/gdicmn.h
@@ -24,8 +24,10 @@ enum wxBitmapType
wxBITMAP_TYPE_XBM_DATA,
wxBITMAP_TYPE_XPM,
wxBITMAP_TYPE_XPM_DATA,
- wxBITMAP_TYPE_TIF,
- wxBITMAP_TYPE_TIF_RESOURCE,
+ wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIF = wxBITMAP_TYPE_TIFF,
+ wxBITMAP_TYPE_TIFF_RESOURCE,
+ wxBITMAP_TYPE_TIF_RESOURCE = wxBITMAP_TYPE_TIFF_RESOURCE,
wxBITMAP_TYPE_GIF,
wxBITMAP_TYPE_GIF_RESOURCE,
wxBITMAP_TYPE_PNG,
diff --git a/interface/wx/image.h b/interface/wx/image.h
index cdeba80f58..93df391073 100644
--- a/interface/wx/image.h
+++ b/interface/wx/image.h
@@ -342,12 +342,12 @@ const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
While all images have RGB data, not all images have an alpha channel. Before
using wxImage::GetAlpha you should check if this image contains an alpha
- channel with wxImage::HasAlpha. Currently the BMP, PNG, and TIFF format
+ channel with wxImage::HasAlpha. Currently the BMP, PNG, TGA, and TIFF format
handlers have full alpha channel support for loading so if you want to use
alpha you have to use one of these formats. If you initialize the image
alpha channel yourself using wxImage::SetAlpha, you should save it in
- either PNG or TGA format to avoid losing it as these are the only handlers
- that currently support saving with alpha.
+ either PNG, TGA, or TIFF format to avoid losing it as these are the only
+ handlers that currently support saving with alpha.
@section image_handlers Available image handlers
@@ -363,7 +363,7 @@ const unsigned char wxIMAGE_ALPHA_OPAQUE = 0xff;
- wxGIFHandler: For loading and saving (see below).
- wxPCXHandler: For loading and saving (see below).
- wxPNMHandler: For loading and saving (see below).
- - wxTIFFHandler: For loading (including alpha support) and saving.
+ - wxTIFFHandler: For loading and saving. Includes alpha support.
- wxTGAHandler: For loading and saving. Includes alpha support.
- wxIFFHandler: For loading only.
- wxXPMHandler: For loading and saving.
@@ -494,7 +494,7 @@ public:
/**
@overload
*/
- wxImage(const wxSize& sz, unsigned char* data, unsigned char* data, unsigned char* alpha,
+ wxImage(const wxSize& sz, unsigned char* data, unsigned char* alpha,
bool static_data = false);
/**
@@ -522,7 +522,7 @@ public:
@li wxBITMAP_TYPE_PNG: Load a PNG bitmap file.
@li wxBITMAP_TYPE_PCX: Load a PCX bitmap file.
@li wxBITMAP_TYPE_PNM: Load a PNM bitmap file.
- @li wxBITMAP_TYPE_TIF: Load a TIFF bitmap file.
+ @li wxBITMAP_TYPE_TIFF: Load a TIFF bitmap file.
@li wxBITMAP_TYPE_TGA: Load a TGA bitmap file.
@li wxBITMAP_TYPE_XPM: Load a XPM bitmap file.
@li wxBITMAP_TYPE_ICO: Load a Windows icon file (ICO).
@@ -1084,10 +1084,16 @@ public:
/**
Gets a user-defined string-valued option.
- Currently the only defined string option is
+ Generic options:
@li @c wxIMAGE_OPTION_FILENAME: The name of the file from which the image
was loaded.
+ Options specific to wxGIFHandler:
+ @li @c wxIMAGE_OPTION_GIF_COMMENT: The comment text that is read from
+ or written to the GIF file. In an animated GIF each frame can have
+ its own comment. If there is only a comment in the first frame of
+ a GIF it will not be repeated in other frames.
+
@param name
The name of the option, case-insensitive.
@return
@@ -1162,11 +1168,38 @@ public:
the resulting PNG file. Use this option if your application produces
images with small size variation.
- Options specific to wxGIFHandler:
- @li @c wxIMAGE_OPTION_GIF_COMMENT: The comment text that is read from
- or written to the GIF file. In an animated GIF each frame can have
- its own comment. If there is only a comment in the first frame of
- a GIF it will not be repeated in other frames.
+ Options specific to wxTIFFHandler:
+ @li @c wxIMAGE_OPTION_TIFF_BITSPERSAMPLE: Number of bits per
+ sample (channel). Currently values of 1 and 8 are supported. A
+ value of 1 results in a black and white image. A value of 8 (the
+ default) can mean greyscale or RGB, depending on the value of
+ @c wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL.
+ @li @c wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL: Number of samples
+ (channels) per pixel. Currently values of 1 and 3 are supported.
+ A value of 1 results in either a greyscale (by default) or black and
+ white image, depending on the value of
+ @c wxIMAGE_OPTION_TIFF_BITSPERSAMPLE. A value of 3 (the default)
+ will result in an RGB image.
+ @li @c wxIMAGE_OPTION_TIFF_COMPRESSION: Compression type. By default
+ it is set to 1 (COMPRESSION_NONE). Typical other values are
+ 5 (COMPRESSION_LZW) and 7 (COMPRESSION_JPEG). See tiff.h for more
+ options.
+ @li @c wxIMAGE_OPTION_TIFF_PHOTOMETRIC: Specifies the photometric
+ interpretation. By default it is set to 2 (PHOTOMETRIC_RGB) for RGB
+ images and 0 (PHOTOMETRIC_MINISWHITE) for greyscale or black and
+ white images. It can also be set to 1 (PHOTOMETRIC_MINISBLACK) to
+ treat the lowest value as black and highest as white.
+ If you want a greyscale image it is also sufficient to only specify
+ @c wxIMAGE_OPTION_TIFF_PHOTOMETRIC and set it to either
+ PHOTOMETRIC_MINISWHITE or PHOTOMETRIC_MINISBLACK. The other values
+ are taken care of.
+
+ @note
+ Be careful when combining the options @c wxIMAGE_OPTION_TIFF_SAMPLESPERPIXEL,
+ @c wxIMAGE_OPTION_TIFF_BITSPERSAMPLE, and @c wxIMAGE_OPTION_TIFF_PHOTOMETRIC.
+ While some measures are taken to prevent illegal combinations and/or
+ values, it is still easy to abuse them and come up with invalid
+ results in the form of either corrupted images or crashes.
@param name
The name of the option, case-insensitive.
@@ -1266,7 +1299,7 @@ public:
@li wxBITMAP_TYPE_PNG: Load a PNG bitmap file.
@li wxBITMAP_TYPE_PCX: Load a PCX bitmap file.
@li wxBITMAP_TYPE_PNM: Load a PNM bitmap file.
- @li wxBITMAP_TYPE_TIF: Load a TIFF bitmap file.
+ @li wxBITMAP_TYPE_TIFF: Load a TIFF bitmap file.
@li wxBITMAP_TYPE_TGA: Load a TGA bitmap file.
@li wxBITMAP_TYPE_XPM: Load a XPM bitmap file.
@li wxBITMAP_TYPE_ICO: Load a Windows icon file (ICO).
@@ -1748,7 +1781,7 @@ public:
@li wxBITMAP_TYPE_PNG: Load a PNG bitmap file.
@li wxBITMAP_TYPE_PCX: Load a PCX bitmap file.
@li wxBITMAP_TYPE_PNM: Load a PNM bitmap file.
- @li wxBITMAP_TYPE_TIF: Load a TIFF bitmap file.
+ @li wxBITMAP_TYPE_TIFF: Load a TIFF bitmap file.
@li wxBITMAP_TYPE_TGA: Load a TGA bitmap file.
@li wxBITMAP_TYPE_XPM: Load a XPM bitmap file.
@li wxBITMAP_TYPE_ICO: Load a Windows icon file (ICO).
@@ -1796,6 +1829,30 @@ public:
static wxImage::RGBValue HSVtoRGB(const wxImage::HSVValue& hsv);
};
+
+class wxImageHistogram : public wxImageHistogramBase
+{
+public:
+ wxImageHistogram();
+
+ // get the key in the histogram for the given RGB values
+ static unsigned long MakeKey(unsigned char r,
+ unsigned char g,
+ unsigned char b);
+
+ // find first colour that is not used in the image and has higher
+ // RGB values than RGB(startR, startG, startB)
+ //
+ // returns true and puts this colour in r, g, b (each of which may be NULL)
+ // on success or returns false if there are no more free colours
+ bool FindFirstUnusedColour(unsigned char *r,
+ unsigned char *g,
+ unsigned char *b,
+ unsigned char startR = 1,
+ unsigned char startG = 0,
+ unsigned char startB = 0 ) const;
+};
+
/**
An instance of an empty image without an alpha channel.
*/
diff --git a/interface/wx/kbdstate.h b/interface/wx/kbdstate.h
index 27060a379a..4b85b6383a 100644
--- a/interface/wx/kbdstate.h
+++ b/interface/wx/kbdstate.h
@@ -77,18 +77,23 @@ public:
bool HasModifiers() const;
/**
- Returns true if the Control key is pressed.
+ Returns true if the Control key or Apple/Command key under OS X is pressed.
This function doesn't distinguish between right and left control keys.
- In portable code you usually want to use CmdDown() to automatically
- test for the more frequently used Command key (and not the rarely used
- Control one) under Mac.
-
Notice that GetModifiers() should usually be used instead of this one.
*/
bool ControlDown() const;
+ /**
+ Returns true if the Control key (also under OS X).
+
+ This function doesn't distinguish between right and left control keys.
+
+ Notice that GetModifiers() should usually be used instead of this one.
+ */
+ bool RawControlDown() const;
+
/**
Returns true if the Shift key is pressed.
@@ -102,9 +107,7 @@ public:
Returns true if the Meta/Windows/Apple key is pressed.
This function tests the state of the key traditionally called Meta
- under Unix systems, Windows keys under MSW and Apple, or Command, key
- under Mac.
-
+ under Unix systems, Windows keys under MSW
Notice that GetModifiers() should usually be used instead of this one.
@see CmdDown()
@@ -119,13 +122,8 @@ public:
bool AltDown() const;
/**
- Returns true if the key used for command accelerators is pressed.
-
- @c Cmd is a pseudo key which is Control for PC and Unix platforms but
- Apple (or Command) key under Macs: it makes often sense to use it
- instead of ControlDown() because @c Command key is used for the same
- thing under Mac as @c Control elsewhere (even though @c Control still
- exists, it is usually not used for the same purpose under Mac).
+ Returns true if the key used for command accelerators is pressed. Same as
+ ControlDown(). Deprecated.
Notice that GetModifiers() should usually be used instead of this one.
*/
@@ -133,6 +131,7 @@ public:
void SetControlDown(bool down);
+ void SetRawControlDown(bool down);
void SetShiftDown(bool down);
void SetAltDown(bool down);
void SetMetaDown(bool down);
diff --git a/interface/wx/layout.h b/interface/wx/layout.h
new file mode 100644
index 0000000000..1ea3bab324
--- /dev/null
+++ b/interface/wx/layout.h
@@ -0,0 +1,137 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: layout.h
+// Purpose: interface of layout constraints classes
+// Author: wxWidgets team
+// RCS-ID: $Id: $
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+
+enum wxEdge
+{
+ wxLeft, wxTop, wxRight, wxBottom, wxWidth, wxHeight,
+ wxCentre, wxCenter = wxCentre, wxCentreX, wxCentreY
+};
+
+enum wxRelationship
+{
+ wxUnconstrained,
+ wxAsIs,
+ wxPercentOf,
+ wxAbove,
+ wxBelow,
+ wxLeftOf,
+ wxRightOf,
+ wxSameAs,
+ wxAbsolute
+};
+
+const int wxLAYOUT_DEFAULT_MARGIN = 0;
+
+// ----------------------------------------------------------------------------
+// wxIndividualLayoutConstraint: a constraint on window position
+// ----------------------------------------------------------------------------
+
+class wxIndividualLayoutConstraint : public wxObject
+{
+public:
+ wxIndividualLayoutConstraint();
+
+ // note that default copy ctor and assignment operators are ok
+
+ virtual ~wxIndividualLayoutConstraint();
+
+ void Set(wxRelationship rel,
+ wxWindow *otherW,
+ wxEdge otherE,
+ int val = 0,
+ int margin = wxLAYOUT_DEFAULT_MARGIN);
+
+ //
+ // Sibling relationships
+ //
+ void LeftOf(wxWindow *sibling, int margin = wxLAYOUT_DEFAULT_MARGIN);
+ void RightOf(wxWindow *sibling, int margin = wxLAYOUT_DEFAULT_MARGIN);
+ void Above(wxWindow *sibling, int margin = wxLAYOUT_DEFAULT_MARGIN);
+ void Below(wxWindow *sibling, int margin = wxLAYOUT_DEFAULT_MARGIN);
+
+ //
+ // 'Same edge' alignment
+ //
+ void SameAs(wxWindow *otherW, wxEdge edge, int margin = wxLAYOUT_DEFAULT_MARGIN);
+
+ // The edge is a percentage of the other window's edge
+ void PercentOf(wxWindow *otherW, wxEdge wh, int per);
+
+ //
+ // Edge has absolute value
+ //
+ void Absolute(int val);
+
+ //
+ // Dimension is unconstrained
+ //
+ void Unconstrained() { relationship = wxUnconstrained; }
+
+ //
+ // Dimension is 'as is' (use current size settings)
+ //
+ void AsIs() { relationship = wxAsIs; }
+
+ //
+ // Accessors
+ //
+ wxWindow *GetOtherWindow();
+ wxEdge GetMyEdge() const;
+ void SetEdge(wxEdge which);
+ void SetValue(int v);
+ int GetMargin();
+ void SetMargin(int m);
+ int GetValue() const;
+ int GetPercent() const;
+ int GetOtherEdge() const;
+ bool GetDone() const;
+ void SetDone(bool d);
+ wxRelationship GetRelationship();
+ void SetRelationship(wxRelationship r);
+
+ // Reset constraint if it mentions otherWin
+ bool ResetIfWin(wxWindow *otherW);
+
+ // Try to satisfy constraint
+ bool SatisfyConstraint(wxLayoutConstraints *constraints, wxWindow *win);
+
+ // Get the value of this edge or dimension, or if this
+ // is not determinable, -1.
+ int GetEdge(wxEdge which, wxWindow *thisWin, wxWindow *other) const;
+};
+
+// ----------------------------------------------------------------------------
+// wxLayoutConstraints: the complete set of constraints for a window
+// ----------------------------------------------------------------------------
+
+class wxLayoutConstraints : public wxObject
+{
+public:
+ // Edge constraints
+ wxIndividualLayoutConstraint left;
+ wxIndividualLayoutConstraint top;
+ wxIndividualLayoutConstraint right;
+ wxIndividualLayoutConstraint bottom;
+ // Size constraints
+ wxIndividualLayoutConstraint width;
+ wxIndividualLayoutConstraint height;
+ // Centre constraints
+ wxIndividualLayoutConstraint centreX;
+ wxIndividualLayoutConstraint centreY;
+
+ wxLayoutConstraints();
+
+ // note that default copy ctor and assignment operators are ok
+
+ virtual ~wxLayoutConstraints(){}
+
+ bool SatisfyConstraints(wxWindow *win, int *noChanges);
+ bool AreSatisfied() const;
+};
+
diff --git a/interface/wx/menu.h b/interface/wx/menu.h
index 5cbee4bc0a..ad782840e0 100644
--- a/interface/wx/menu.h
+++ b/interface/wx/menu.h
@@ -453,6 +453,12 @@ public:
class wxMenu : public wxEvtHandler
{
public:
+
+ /**
+ Constructs a wxMenu object.
+ */
+ wxMenu();
+
/**
Constructs a wxMenu object.
diff --git a/interface/wx/menuitem.h b/interface/wx/menuitem.h
index b0b0f991f0..6c1efd28d0 100644
--- a/interface/wx/menuitem.h
+++ b/interface/wx/menuitem.h
@@ -369,6 +369,7 @@ public:
(from F1 to F12) or one of the special characters listed in the table
below (again, case doesn't matter):
- @c DEL or @c DELETE: Delete key
+ - @c BACK : Backspace key
- @c INS or @c INSERT: Insert key
- @c ENTER or @c RETURN: Enter key
- @c PGUP: PageUp key
diff --git a/interface/wx/sizer.h b/interface/wx/sizer.h
index ec02ec9e3c..d923962860 100644
--- a/interface/wx/sizer.h
+++ b/interface/wx/sizer.h
@@ -1581,6 +1581,11 @@ public:
Note that this method does not trigger relayout.
*/
void SetNonFlexibleGrowMode(wxFlexSizerGrowMode mode);
+
+ virtual void RecalcSizes();
+
+ virtual wxSize CalcMin();
+
};
diff --git a/interface/wx/splitter.h b/interface/wx/splitter.h
index 35348ce9fe..3a7dbee2a3 100644
--- a/interface/wx/splitter.h
+++ b/interface/wx/splitter.h
@@ -6,6 +6,20 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+
+enum wxSplitMode
+{
+ wxSPLIT_HORIZONTAL = 1,
+ wxSPLIT_VERTICAL
+};
+
+enum
+{
+ wxSPLIT_DRAG_NONE,
+ wxSPLIT_DRAG_DRAGGING,
+ wxSPLIT_DRAG_LEFT_DOWN
+};
+
/**
@class wxSplitterWindow
diff --git a/interface/wx/textentry.h b/interface/wx/textentry.h
index a2c7b7f8b6..b1b6a5d5cf 100644
--- a/interface/wx/textentry.h
+++ b/interface/wx/textentry.h
@@ -112,6 +112,27 @@ public:
*/
bool AutoCompleteFileNames();
+ /**
+ Call this function to enable auto-completion of the text using the file
+ system directories.
+
+ Unlike AutoCompleteFileNames() which completes both file names and
+ directories, this function only completes the directory names.
+
+ Notice that currently this function is only implemented in wxMSW port
+ and does nothing under the other platforms.
+
+ @since 2.9.3
+
+ @return
+ @true if the auto-completion was enabled or @false if the operation
+ failed, typically because auto-completion is not supported by the
+ current platform.
+
+ @see AutoComplete()
+ */
+ bool AutoCompleteDirectories();
+
/**
Returns @true if the selection can be copied to the clipboard.
*/
diff --git a/interface/wx/toplevel.h b/interface/wx/toplevel.h
index 32e09f7e6f..cd00995b2d 100644
--- a/interface/wx/toplevel.h
+++ b/interface/wx/toplevel.h
@@ -282,8 +282,8 @@ public:
and will be only deleted when the window itself is destroyed.
This function is not available in the other ports by design, any
- occurrences of it in the portable code must be guarded by @code #ifdef
- __WXMSW__ @endcode preprocessor guards.
+ occurrences of it in the portable code must be guarded by
+ @code #ifdef __WXMSW__ @endcode preprocessor guards.
@since 2.9.3
*/
diff --git a/interface/wx/treelist.h b/interface/wx/treelist.h
new file mode 100644
index 0000000000..66f8610314
--- /dev/null
+++ b/interface/wx/treelist.h
@@ -0,0 +1,707 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: interface/wx/treelist.h
+// Purpose: wxTreeListCtrl class documentation
+// Author: Vadim Zeitlin
+// Created: 2011-08-17
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+/**
+ Unique identifier of an item in wxTreeListCtrl.
+
+ This is an opaque class which can't be used by the application in any other
+ way than receiving or passing it to wxTreeListCtrl and checking for
+ validity.
+
+ @see wxTreeListCtrl
+
+ @library{wxadv}
+ @category{ctrl}
+
+ @since 2.9.3
+ */
+class wxTreeListItem
+{
+public:
+ /**
+ Only the default constructor is publicly accessible.
+
+ Default constructing a wxTreeListItem creates an invalid item.
+ */
+ wxTreeListItem();
+
+ /**
+ Return true if the item is valid.
+ */
+ bool IsOk() const;
+};
+
+/**
+ Container of multiple items.
+ */
+typedef wxVector wxTreeListItems;
+
+/**
+ Special wxTreeListItem value meaning "insert before the first item".
+
+ This value can be passed to wxTreeListCtrl::InsertItem() to achieve the
+ same effect as calling wxTreeListCtrl::PrependItem().
+ */
+extern const wxTreeListItem wxTLI_FIRST;
+
+/**
+ Special wxTreeListItem value meaning "insert after the last item".
+
+ This value can be passed to wxTreeListCtrl::InsertItem() to achieve the
+ same effect as calling wxTreeListCtrl::AppendItem().
+ */
+extern const wxTreeListItem wxTLI_LAST;
+
+/**
+ A control combining wxTreeCtrl and wxListCtrl features.
+
+ This is a multi-column tree control optionally supporting images and
+ checkboxes for the items in the first column.
+
+ It is currently implemented using wxDataViewCtrl internally but provides a
+ much simpler interface for the common use case it addresses. Thus, one of
+ the design principles for this control is simplicity and intentionally
+ doesn't provide all the features of wxDataViewCtrl. Most importantly, this
+ class stores all its data internally and doesn't require you to define a
+ custom model for it.
+
+ Instead, this controls works like wxTreeCtrl or non-virtual wxListCtrl and
+ allows you to simply add items to it using wxTreeListCtrl::AppendItem() and
+ related methods. Typically, you start by setting up the columns (you must
+ have at least one) by calling wxTreeListCtrl::AppendColumn() and then add
+ the items. While only the text of the first column can be specified when
+ adding them, you can use wxTreeListCtrl::SetItemText() to set the text of
+ the other columns.
+
+
+ Here are the styles supported by this control. Notice that using
+ wxTL_USER_3STATE implies wxTL_3STATE and wxTL_3STATE in turn implies
+ wxTL_CHECKBOX.
+
+ @beginStyleTable
+ @style{wxTL_SINGLE}
+ Single selection, this is the default.
+ @style{wxTL_MULTIPLE}
+ Allow multiple selection, see GetSelections().
+ @style{wxTL_CHECKBOX}
+ Show the usual, 2 state, checkboxes for the items in the first column.
+ @style{wxTL_3STATE}
+ Show the checkboxes that can possibly be set by the program, but not
+ the user, to a third, undetermined, state, for the items in the first
+ column. Implies wxTL_CHECKBOX.
+ @style{wxTL_USER_3STATE}
+ Same as wxTL_3STATE but the user can also set the checkboxes to the
+ undetermined state. Implies wxTL_3STATE.
+ @style{wxTL_DEFAULT_STYLE}
+ Style used by the control by default, just wxTL_SINGLE currently.
+ @endStyleTable
+
+ @beginEventTable{wxTreeListEvent}
+ @event{EVT_TREELIST_SELECTION_CHANGED(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_SELECTION_CHANGED event and notifies
+ about the selection change in the control. In the single selection case
+ the item indicated by the event has been selected and previously
+ selected item, if any, was deselected. In multiple selection case, the
+ selection of this item has just changed (it may have been either
+ selected or deselected) but notice that the selection of other items
+ could have changed as well, use wxTreeListCtrl::GetSelections() to
+ retrieve the new selection if necessary.
+ @event{EVT_TREELIST_ITEM_EXPANDING(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_ITEM_EXPANDING event notifying about
+ the given branch being expanded. This event is sent before the
+ expansion occurs and can be vetoed to prevent it from happening.
+ @event{EVT_TREELIST_ITEM_EXPANDED(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_ITEM_EXPANDED event notifying about
+ the expansion of the given branch. This event is sent after the
+ expansion occurs and can't be vetoed.
+ @event{EVT_TREELIST_ITEM_CHECKED(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_ITEM_CHeCKED event notifying about
+ the user checking or unchecking the item. You can use
+ wxTreeListCtrl::GetCheckedState() to retrieve the new item state and
+ wxTreeListEvent::GetOldCheckedState() to get the previous one.
+ @event{EVT_TREELIST_ITEM_ACTIVATED(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_ITEM_ACTIVATED event notifying about
+ the user double clicking the item or activating it from keyboard.
+ @event{EVT_TREELIST_ITEM_CONTEXT_MENU(id, func)}
+ Process @c wxEVT_COMMAND_TREELIST_ITEM_CONTEXT_MENU event indicating
+ that the popup menu for the given item should be displayed.
+ @endEventTable
+
+ @library{wxadv}
+ @category{ctrl}
+
+ @since 2.9.3
+
+ @see wxTreeCtrl, wxDataViewCtrl
+ */
+class wxTreeListCtrl : public wxWindow
+{
+public:
+ /**
+ Default constructor, call Create() later.
+
+ This constructor is used during two-part construction process when it
+ is impossible or undesirable to create the window when constructing the
+ object.
+ */
+ wxTreeListCtrl();
+
+ /**
+ Full constructing, creating the object and its window.
+
+ See Create() for the parameters description.
+ */
+ wxTreeListCtrl(wxWindow* parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTL_DEFAULT_STYLE,
+ const wxString& name = wxTreeListCtrlNameStr);
+
+ /**
+ Create the control window.
+
+ Can be only called for the objects created using the default
+ constructor and exactly once.
+
+ @param parent
+ The parent window, must be non-NULL.
+ @param id
+ The window identifier, may be ::wxID_ANY.
+ @param pos
+ The initial window position, usually unused.
+ @param size
+ The initial window size, usually unused.
+ @param style
+ The window style, see their description in the class documentation.
+ @param name
+ The name of the window.
+ */
+ bool Create(wxWindow* parent,
+ wxWindowID id,
+ const wxPoint& pos = wxDefaultPosition,
+ const wxSize& size = wxDefaultSize,
+ long style = wxTL_DEFAULT_STYLE,
+ const wxString& name = wxTreeListCtrlNameStr);
+
+
+ /**
+ Image list methods.
+
+ Like wxTreeCtrl and wxListCtrl this class uses wxImageList so if you
+ intend to use item icons with it, you must construct wxImageList
+ containing them first and then specify the indices of the icons in this
+ image list when adding the items later.
+ */
+ //@{
+
+ /// A constant indicating that no image should be used for an item.
+ static const int NO_IMAGE = -1;
+
+ /**
+ Sets the image list and gives its ownership to the control.
+
+ The image list assigned with this method will be automatically deleted
+ by wxTreeCtrl as appropriate (i.e. it takes ownership of the list).
+
+ @see SetImageList().
+ */
+ void AssignImageList(wxImageList* imageList);
+
+ /**
+ Sets the image list.
+
+ The image list assigned with this method will @b not be deleted by the
+ control itself and you will need to delete it yourself, use
+ AssignImageList() to give the image list ownership to the control.
+
+ @param imageList
+ Image list to use, may be @NULL to not show any images any more.
+ */
+ void SetImageList(wxImageList* imageList);
+
+ //@}
+
+
+ /**
+ Column methods.
+ */
+ //@{
+
+ /**
+ Add a column with the given title and attributes.
+
+ @param title
+ The column label.
+ @param width
+ The width of the column in pixels or the special
+ wxCOL_WIDTH_AUTOSIZE value indicating that the column should adjust
+ to its contents.
+ @param align
+ Alignment of both the column header and its items.
+ @param flags
+ Column flags, currently can only include wxCOL_RESIZABLE to allow
+ the user to resize the column.
+ @return
+ Index of the new column or -1 on failure.
+ */
+ int AppendColumn(const wxString& title,
+ int width = wxCOL_WIDTH_AUTOSIZE,
+ wxAlignment align = wxALIGN_LEFT,
+ int flags = wxCOL_RESIZABLE);
+
+ /// Return the total number of columns.
+ unsigned GetColumnCount() const;
+
+ /**
+ Delete the column with the given index.
+
+ @param col
+ Column index in 0 to GetColumnCount() (exclusive) range.
+ @return
+ True if the column was deleted, false if index is invalid or
+ deleting the column failed for some other reason.
+ */
+ bool DeleteColumn(unsigned col);
+
+ /**
+ Delete all columns.
+
+ @see DeleteAllItems()
+ */
+ void ClearColumns();
+
+ /**
+ Change the width of the given column.
+
+ Set column width to either the given value in pixels or to the value
+ large enough to fit all of the items if width is wxCOL_WIDTH_AUTOSIZE.
+ */
+ void SetColumnWidth(unsigned col, int width);
+
+ /// Get the current width of the given column in pixels.
+ int GetColumnWidth(unsigned col) const;
+
+ /**
+ Get the width appropriate for showing the given text.
+
+ This is typically used as second argument for AppendColumn() or with
+ SetColumnWidth().
+ */
+ int WidthFor(const wxString& text) const;
+
+ //@}
+
+
+ /**
+ Adding and removing items.
+
+ When adding items, the parent and text of the first column of the new item
+ must always be specified, the rest is optional.
+
+ Each item can have two images: one used for closed state and another
+ for opened one. Only the first one is ever used for the items that
+ don't have children. And both are not set by default.
+
+ It is also possible to associate arbitrary client data pointer with the
+ new item. It will be deleted by the control when the item is deleted
+ (either by an explicit DeleteItem() call or because the entire control
+ is destroyed).
+ */
+ //@{
+
+ /// Same as InsertItem() with wxTLI_LAST.
+ wxTreeListItem AppendItem(wxTreeListItem parent,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL);
+
+ /**
+ Insert a new item into the tree.
+
+ @param parent
+ The item parent. Must be valid, may be GetRootItem().
+ @param previous
+ The previous item that this one should be inserted immediately
+ after. It must be valid but may be one of the special values
+ wxTLI_FIRST or wxTLI_LAST indicating that the item should be either
+ inserted before the first child of its parent (if any) or after the
+ last one.
+ @param imageClosed
+ The normal item image, may be NO_IMAGE to not show any image.
+ @param imageOpened
+ The item image shown when it's in the expanded state.
+ @param data
+ Optional client data pointer that can be later retrieved using
+ GetItemData() and will be deleted by the tree when the item itself
+ is deleted.
+ */
+ wxTreeListItem InsertItem(wxTreeListItem parent,
+ wxTreeListItem previous,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL);
+
+ /// Same as InsertItem() with wxTLI_FIRST.
+ wxTreeListItem PrependItem(wxTreeListItem parent,
+ const wxString& text,
+ int imageClosed = NO_IMAGE,
+ int imageOpened = NO_IMAGE,
+ wxClientData* data = NULL);
+
+ /// Delete the specified item.
+ void DeleteItem(wxTreeListItem item);
+
+ /// Delete all tree items.
+ void DeleteAllItems();
+
+ //@}
+
+
+ /**
+ Methods for the tree navigation.
+
+ The tree has an invisible root item which is the hidden parent of all
+ top-level items in the tree. Starting from it it is possible to iterate
+ over all tree items using GetNextItem().
+
+ It is also possible to iterate over just the children of the given item
+ by using GetFirstChild() to get the first of them and then calling
+ GetNextSibling() to retrieve all the others.
+ */
+ //@{
+
+ /// Return the (never shown) root item.
+ wxTreeListItem GetRootItem() const;
+
+ /**
+ Return the parent of the given item.
+
+ All the tree items visible in the tree have valid parent items, only
+ the never shown root item has no parent.
+ */
+ wxTreeListItem GetItemParent(wxTreeListItem item) const;
+
+ /**
+ Return the first child of the given item.
+
+ Item may be the root item.
+
+ Return value may be invalid if the item doesn't have any children.
+ */
+ wxTreeListItem GetFirstChild(wxTreeListItem item) const;
+
+ /**
+ Return the next sibling of the given item.
+
+ Return value may be invalid if there are no more siblings.
+ */
+ wxTreeListItem GetNextSibling(wxTreeListItem item) const;
+
+ /**
+ Return the first item in the tree.
+
+ This is the first child of the root item.
+
+ @see GetNextItem()
+ */
+ wxTreeListItem GetFirstItem() const;
+
+ /**
+ Get item after the given one in the depth-first tree-traversal order.
+
+ Calling this function starting with the result of GetFirstItem() allows
+ iterating over all items in the tree.
+
+ The iteration stops when this function returns an invalid item, i.e.
+ @code
+ for ( wxTreeListItem item = tree->GetFirstItem();
+ item.IsOk();
+ item = tree->GetNextItem(item) )
+ {
+ ... Do something with every tree item ...
+ }
+ @endcode
+ */
+ wxTreeListItem GetNextItem(wxTreeListItem item) const;
+
+ //@}
+
+
+ /**
+ Items attributes
+ */
+ //@{
+
+ /**
+ Return the text of the given item.
+
+ By default, returns the text of the first column but any other one can
+ be specified using @a col argument.
+ */
+ const wxString& GetItemText(wxTreeListItem item, unsigned col = 0) const;
+
+ /**
+ Set the text of the specified column of the given item.
+ */
+ void SetItemText(wxTreeListItem item, unsigned col, const wxString& text);
+
+ /**
+ Set the text of the first column of the given item.
+ */
+ void SetItemText(wxTreeListItem item, const wxString& text);
+
+ /**
+ Set the images for the given item.
+
+ See InsertItem() for the images parameters descriptions.
+ */
+ void SetItemImage(wxTreeListItem item, int closed, int opened = NO_IMAGE);
+
+ /**
+ Get the data associated with the given item.
+
+ The returned pointer may be @NULL.
+
+ It must not be deleted by the caller as this will be done by the
+ control itself.
+ */
+ wxClientData* GetItemData(wxTreeListItem item) const;
+
+ /**
+ Set the data associated with the given item.
+
+ Previous client data, if any, is deleted when this function is called
+ so it may be used to delete the current item data object and reset it
+ by passing @NULL as @a data argument.
+ */
+ void SetItemData(wxTreeListItem item, wxClientData* data);
+
+ //@}
+
+
+ /**
+ Expanding and collapsing tree branches.
+
+ Notice that calling neither Expand() nor Collapse() method generates
+ any events.
+ */
+ //@{
+
+ /**
+ Expand the given tree branch.
+ */
+ void Expand(wxTreeListItem item);
+
+ /**
+ Collapse the given tree branch.
+ */
+ void Collapse(wxTreeListItem item);
+
+ /**
+ Return whether the given item is expanded.
+ */
+ bool IsExpanded(wxTreeListItem item) const;
+
+ //@}
+
+
+ /**
+ Selection methods.
+
+ The behaviour of the control is different in single selection mode (the
+ default) and multi-selection mode (if @c wxTL_MULTIPLE was specified
+ when creating it). Not all methods can be used in both modes and some
+ of those that can don't behave in the same way in two cases.
+ */
+ //@{
+
+ /**
+ Return the currently selected item.
+
+ This method can't be used with multi-selection controls, use
+ GetSelections() instead.
+
+ The return value may be invalid if no item has been selected yet. Once
+ an item in a single selection control was selected, it will keep a
+ valid selection.
+ */
+ wxTreeListItem GetSelection() const;
+
+ /**
+ Fill in the provided array with all the selected items.
+
+ This method can be used in both single and multi-selection case.
+
+ The previous array contents is destroyed.
+
+ Returns the number of selected items.
+ */
+ unsigned GetSelections(wxTreeListItems& selections) const;
+
+ /**
+ Select the given item.
+
+ In single selection mode, deselects any other selected items, in
+ multi-selection case it adds to the selection.
+ */
+ void Select(wxTreeListItem item);
+
+ /**
+ Deselect the given item.
+
+ This method can be used in multiple selection mode only.
+ */
+ void Unselect(wxTreeListItem item);
+
+ /**
+ Return true if the item is selected.
+
+ This method can be used in both single and multiple selection modes.
+ */
+ bool IsSelected(wxTreeListItem item) const;
+
+ /**
+ Select all the control items.
+
+ Can be only used in multi-selection mode.
+ */
+ void SelectAll();
+
+ /**
+ Deselect all the control items.
+
+ Can be only used in multi-selection mode.
+ */
+ void UnselectAll();
+
+ //@}
+
+
+ /**
+ Checkbox handling
+
+ Methods in this section can only be used with the controls created with
+ wxTL_CHECKBOX style.
+ */
+ //@{
+
+ /**
+ Change the item checked state.
+
+ @param item
+ Valid non-root tree item.
+ @param state
+ One of wxCHK_CHECKED, wxCHK_UNCHECKED or, for the controls with
+ wxTL_3STATE or wxTL_USER_3STATE styles, wxCHK_UNDETERMINED.
+ */
+ void CheckItem(wxTreeListItem item, wxCheckBoxState state = wxCHK_CHECKED);
+
+ /**
+ Change the checked state of the given item and all its children.
+
+ This is the same as CheckItem() but checks or unchecks not only this
+ item itself but all its children recursively as well.
+ */
+ void CheckItemRecursively(wxTreeListItem item,
+ wxCheckBoxState state = wxCHK_CHECKED);
+
+ /**
+ Uncheck the given item.
+
+ This is synonymous with CheckItem(wxCHK_UNCHECKED).
+ */
+ void UncheckItem(wxTreeListItem item);
+
+ /**
+ Update the state of the parent item to reflect the checked state of its
+ children.
+
+ This method updates the parent of this item recursively: if this item
+ and all its siblings are checked, the parent will become checked as
+ well. If this item and all its siblings are unchecked, the parent will
+ be unchecked. And if the siblings of this item are not all in the same
+ state, the parent will be switched to indeterminate state. And then the
+ same logic will be applied to the parents parent and so on recursively.
+
+ This is typically called when the state of the given item has changed
+ from EVT_TREELIST_ITEM_CHECKED() handler in the controls which have
+ wxTL_3STATE flag. Notice that without this flag this function can't
+ work as it would be unable to set the state of a parent with both
+ checked and unchecked items so it's only allowed to call it when this
+ flag is set.
+ */
+ void UpdateItemParentStateRecursively(wxTreeListItem item);
+
+ /**
+ Return the checked state of the item.
+
+ The return value can be wxCHK_CHECKED, wxCHK_UNCHECKED or
+ wxCHK_UNDETERMINED.
+ */
+ wxCheckBoxState GetCheckedState(wxTreeListItem item) const;
+
+ /**
+ Return true if all children of the given item are in the specified
+ state.
+
+ This is especially useful for the controls with @c wxTL_3STATE style to
+ allow to decide whether the parent effective state should be the same
+ @a state, if all its children are in it, or ::wxCHK_UNDETERMINED.
+
+ @see UpdateItemParentStateRecursively()
+ */
+ bool AreAllChildrenInState(wxTreeListItem item,
+ wxCheckBoxState state) const;
+
+ //@}
+};
+
+/**
+ Event generated by wxTreeListCtrl.
+
+ @since 2.9.3
+ */
+class wxTreeListEvent : public wxNotifyEvent
+{
+public:
+ /**
+ Return the item affected by the event.
+
+ This is the item being selected, expanded, checked or activated
+ (depending on the event type).
+ */
+ wxTreeListItem GetItem() const;
+
+ /**
+ Return the previous state of the item checkbox.
+
+ This method can be used with @c wxEVT_COMMAND_TREELIST_ITEM_CHeCKED
+ events only.
+
+ Notice that the new state of the item can be retrieved using
+ wxTreeListCtrl::GetCheckedState().
+ */
+ wxCheckBoxState GetOldCheckedState() const;
+};
+
+
+/**
+ Type of wxTreeListEvent event handlers.
+
+ This macro should be used with wxEvtHandler::Connect() when connecting to
+ wxTreeListCtrl events.
+ */
+#define wxTreeListEventHandler(func) \
+ wxEVENT_HANDLER_CAST(wxTreeListEventFunction, func)
+
+#endif // _WX_TREELIST_H_
diff --git a/interface/wx/valnum.h b/interface/wx/valnum.h
index 3cf138a07e..0ca772304c 100644
--- a/interface/wx/valnum.h
+++ b/interface/wx/valnum.h
@@ -101,7 +101,7 @@ public:
Calling this is equivalent to calling both SetMin() and SetMax().
*/
- void SetRange(ValueType min, ValueType max)
+ void SetRange(ValueType min, ValueType max);
/**
@@ -156,6 +156,12 @@ public:
be restricted further by calling SetMin() and SetMax() or SetRange()
methods inherited from the base class.
+ When the validator displays integers with thousands separators, the
+ character used for the separators (usually "." or ",") depends on the locale
+ set with wxLocale (note that you shouldn't change locale with setlocale()
+ as this can result in a mismatch between the thousands separator used by
+ wxLocale and the one used by the run-time library).
+
A simple example of using this class:
@code
class MyDialog : public wxDialog
@@ -252,6 +258,12 @@ wxMakeIntegerValidator(T *value, int style = wxNUM_VAL_DEFAULT);
implementation. As with the range, the precision can be restricted after
the validator creation if necessary.
+ When the validator displays numbers with decimal or thousands separators,
+ the characters used for the separators (usually "." or ",") depend on the
+ locale set with wxLocale (note that you shouldn't change locale with
+ setlocale() as this can result in a mismatch between the separators used by
+ wxLocale and the one used by the run-time library).
+
A simple example of using this class:
@code
class MyDialog : public wxDialog
diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 269aa39ec8..28709171bc 100644
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -553,6 +553,18 @@ protected:
wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
wxWindow* windowToUse = 0);
+ /**
+ Gets a direction.
+
+ If the given @a param is not present or has empty value, @a dir is
+ returned by default. Otherwise the value of the parameter is parsed and
+ a warning is generated if it's not one of @c wxLEFT, @c wxTOP, @c
+ wxRIGHT or @c wxBOTTOM.
+
+ @since 2.9.3
+ */
+ wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT);
+
/**
Gets a font.
*/
diff --git a/misc/scripts/clean_patch b/misc/scripts/clean_patch
new file mode 100755
index 0000000000..767aadeb8a
--- /dev/null
+++ b/misc/scripts/clean_patch
@@ -0,0 +1,2 @@
+#!/bin/sh
+filterdiff -x '*/*.vcproj' -x '*/*.dsp' -x autoconf_inc.m4 -x configure -x '*/makefile.*' -x '*Makefile.in' -x setup.h.in -x include/wx/msw/wince/setup.h -x '*/setup0.h' "$@"
diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index f3c8bb2074..5fb2a2683d 100644
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -684,7 +684,7 @@ void MyFrame::BuildDataViewCtrl(wxPanel* parent, unsigned int nPanel, unsigned l
wxImageList *ilist = new wxImageList( 16, 16 );
ilist->Add( wxIcon(wx_small_xpm) );
- tc->SetImageList( ilist );
+ tc->AssignImageList( ilist );
wxDataViewItem parent =
tc->AppendContainer( wxDataViewItem(0), "The Root", 0 );
diff --git a/samples/image/canvas.cpp b/samples/image/canvas.cpp
index 3bff81316f..2fc194423c 100644
--- a/samples/image/canvas.cpp
+++ b/samples/image/canvas.cpp
@@ -243,7 +243,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
#if wxUSE_LIBTIFF
image.Destroy();
- if ( !image.LoadFile( dir + wxT("horse.tif"), wxBITMAP_TYPE_TIF ) )
+ if ( !image.LoadFile( dir + wxT("horse.tif"), wxBITMAP_TYPE_TIFF ) )
{
wxLogError(wxT("Can't load TIFF image"));
}
diff --git a/samples/keyboard/keyboard.cpp b/samples/keyboard/keyboard.cpp
index f218f6bbaf..cdde7c350c 100644
--- a/samples/keyboard/keyboard.cpp
+++ b/samples/keyboard/keyboard.cpp
@@ -338,7 +338,9 @@ const char* GetVirtualKeyCodeName(int keycode)
WXK_(WINDOWS_LEFT)
WXK_(WINDOWS_RIGHT)
- WXK_(COMMAND)
+#ifdef __WXOSX__
+ WXK_(RAW_CONTROL)
+#endif
#undef WXK_
default:
diff --git a/samples/opengl/cube/cube.cpp b/samples/opengl/cube/cube.cpp
index c4a60b515a..17318f6f4f 100644
--- a/samples/opengl/cube/cube.cpp
+++ b/samples/opengl/cube/cube.cpp
@@ -323,10 +323,11 @@ void TestGLCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
// is wrong when next another canvas is repainted.
const wxSize ClientSize = GetClientSize();
+ TestGLContext& canvas = wxGetApp().GetContext(this);
glViewport(0, 0, ClientSize.x, ClientSize.y);
// Render the graphics and swap the buffers.
- wxGetApp().GetContext(this).DrawRotatedCube(m_xangle, m_yangle);
+ canvas.DrawRotatedCube(m_xangle, m_yangle);
SwapBuffers();
}
diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 707b48c424..66cc2a31c4 100644
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -136,10 +136,13 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
g_doubleBuffer = GL_FALSE;
}
+ m_canvas = new TestGLCanvas(this, wxID_ANY, gl_attrib);
+
// Show the frame
Show(true);
+ Raise();
- m_canvas = new TestGLCanvas(this, wxID_ANY, gl_attrib);
+ m_canvas->InitGL();
}
MyFrame::~MyFrame()
@@ -177,13 +180,6 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent,
// Explicitly create a new rendering context instance for this canvas.
m_glRC = new wxGLContext(this);
-
- // Make the new context current (activate it for use) with this canvas.
- SetCurrent(*m_glRC);
-
- InitGL();
- InitMaterials();
- LoadSurface("isosurf.dat.gz");
}
TestGLCanvas::~TestGLCanvas()
@@ -279,6 +275,8 @@ void TestGLCanvas::OnPaint( wxPaintEvent& WXUNUSED(event) )
void TestGLCanvas::OnSize(wxSizeEvent& event)
{
+ if ( !IsShownOnScreen() )
+ return;
// This is normally only necessary if there is more than one wxGLCanvas
// or more than one wxGLContext in the application.
SetCurrent(*m_glRC);
@@ -406,6 +404,9 @@ void TestGLCanvas::InitMaterials()
void TestGLCanvas::InitGL()
{
+ // Make the new context current (activate it for use) with this canvas.
+ SetCurrent(*m_glRC);
+
glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glShadeModel(GL_SMOOTH);
@@ -428,5 +429,8 @@ void TestGLCanvas::InitGL()
glEnable( GL_VERTEX_ARRAY );
glEnable( GL_NORMAL_ARRAY );
}
+
+ InitMaterials();
+ LoadSurface("isosurf.dat.gz");
}
diff --git a/samples/opengl/penguin/penguin.cpp b/samples/opengl/penguin/penguin.cpp
index a50f6dfd4d..c0c894069e 100644
--- a/samples/opengl/penguin/penguin.cpp
+++ b/samples/opengl/penguin/penguin.cpp
@@ -153,9 +153,6 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent,
// Explicitly create a new rendering context instance for this canvas.
m_glRC = new wxGLContext(this);
- // Make the new context current (activate it for use) with this canvas.
- SetCurrent(*m_glRC);
-
m_gldata.initialized = false;
// initialize view matrix
@@ -303,6 +300,9 @@ void TestGLCanvas::InitGL()
void TestGLCanvas::ResetProjectionMode()
{
+ if ( !IsShownOnScreen() )
+ return;
+
// This is normally only necessary if there is more than one wxGLCanvas
// or more than one wxGLContext in the application.
SetCurrent(*m_glRC);
diff --git a/samples/thread/thread.cpp b/samples/thread/thread.cpp
index 6b0903cb82..1e5c3ee9fb 100644
--- a/samples/thread/thread.cpp
+++ b/samples/thread/thread.cpp
@@ -479,7 +479,7 @@ MyFrame::DoLogRecord(wxLogLevel level,
wxDateTime(info.timestamp).FormatISOTime(),
info.threadId == wxThread::GetMainId()
? wxString("main")
- : wxString::Format("%x", info.threadId),
+ : wxString::Format("%lx", info.threadId),
msg + "\n"
);
}
diff --git a/samples/treelist/Makefile.in b/samples/treelist/Makefile.in
new file mode 100644
index 0000000000..34b31099d2
--- /dev/null
+++ b/samples/treelist/Makefile.in
@@ -0,0 +1,192 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+@MAKE_SET@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+INSTALL = @INSTALL@
+EXEEXT = @EXEEXT@
+WINDRES = @WINDRES@
+SETFILE = @SETFILE@
+NM = @NM@
+BK_DEPS = @BK_DEPS@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+LIBS = @LIBS@
+LDFLAGS_GUI = @LDFLAGS_GUI@
+CXX = @CXX@
+CXXFLAGS = @CXXFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
+TOOLKIT = @TOOLKIT@
+TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
+TOOLKIT_VERSION = @TOOLKIT_VERSION@
+TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@
+EXTRALIBS = @EXTRALIBS@
+EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_SDL = @EXTRALIBS_SDL@
+CXXWARNINGS = @CXXWARNINGS@
+HOST_SUFFIX = @HOST_SUFFIX@
+SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
+wx_top_builddir = @wx_top_builddir@
+
+### Variables: ###
+
+DESTDIR =
+WX_RELEASE = 2.9
+WX_VERSION = $(WX_RELEASE).3
+LIBDIRNAME = $(wx_top_builddir)/lib
+TREELIST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples \
+ $(CXXWARNINGS) $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS = \
+ $(__treelist___win32rc) \
+ $(__treelist_os2_lib_res) \
+ treelist_treelist.o
+
+### Conditionally set variables: ###
+
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX)
+@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
+@COND_BUILD_debug@WXDEBUGFLAG = d
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
+@COND_PLATFORM_MAC_0@__treelist___mac_setfilecmd = @true
+@COND_PLATFORM_MAC_1@__treelist___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL treelist$(EXEEXT)
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+@COND_DEBUG_FLAG_0@__DEBUG_DEFINE_p_2 = --define wxDEBUG_LEVEL=0
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+@COND_USE_EXCEPTIONS_0@__EXCEPTIONS_DEFINE_p_2 = --define wxNO_EXCEPTIONS
+@COND_USE_RTTI_0@__RTTI_DEFINE_p = -DwxNO_RTTI
+@COND_USE_RTTI_0@__RTTI_DEFINE_p_2 = --define wxNO_RTTI
+@COND_USE_THREADS_0@__THREAD_DEFINE_p = -DwxNO_THREADS
+@COND_USE_THREADS_0@__THREAD_DEFINE_p_2 = --define wxNO_THREADS
+@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
+@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
+COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd = $(NM) treelist$(EXEEXT) | if \
+ grep -q pmwin.763 ; then emxbind -ep treelist$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__treelist___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___treelist___os2_emxbindcmd)
+@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
+@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
+@COND_PLATFORM_WIN32_1@__treelist___win32rc = treelist_sample_rc.o
+@COND_PLATFORM_OS2_1@__treelist_os2_lib_res = \
+@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
+@COND_PLATFORM_MACOSX_1@__treelist_app_Contents_PkgInfo___depname \
+@COND_PLATFORM_MACOSX_1@ = treelist.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@__treelist_bundle___depname = treelist_bundle
+@COND_TOOLKIT_MAC@____treelist_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@ $(__treelist_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_CARBON@____treelist_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_CARBON@ = $(__treelist_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_COCOA@____treelist_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_COCOA@ = $(__treelist_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_OSX_IPHONE@____treelist_BUNDLE_TGT_REF_DEP \
+@COND_TOOLKIT_OSX_IPHONE@ = $(__treelist_app_Contents_PkgInfo___depname)
+@COND_TOOLKIT_COCOA@____treelist_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@ $(__treelist_app_Contents_PkgInfo___depname)
+COND_MONOLITHIC_0___WXLIB_ADV_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
+COND_MONOLITHIC_0___WXLIB_CORE_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
+COND_MONOLITHIC_0___WXLIB_BASE_p = \
+ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
+COND_MONOLITHIC_1___WXLIB_MONO_p = \
+ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@__LIB_TIFF_p \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBTIFF_builtin@ -lwxtiff$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@__LIB_JPEG_p \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBJPEG_builtin@ -lwxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@__LIB_PNG_p \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ = \
+@COND_USE_GUI_1_wxUSE_LIBPNG_builtin@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_ZLIB_builtin@__LIB_ZLIB_p = \
+@COND_wxUSE_ZLIB_builtin@ -lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+@COND_wxUSE_REGEX_builtin@__LIB_REGEX_p = $(COND_wxUSE_REGEX_builtin___LIB_REGEX_p)
+@COND_wxUSE_EXPAT_builtin@__LIB_EXPAT_p = \
+@COND_wxUSE_EXPAT_builtin@ -lwxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
+
+### Targets: ###
+
+all: treelist$(EXEEXT) $(__treelist_bundle___depname)
+
+install:
+
+uninstall:
+
+install-strip: install
+
+clean:
+ rm -rf ./.deps ./.pch
+ rm -f ./*.o
+ rm -f treelist$(EXEEXT)
+ rm -rf treelist.app
+
+distclean: clean
+ rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+
+treelist$(EXEEXT): $(TREELIST_OBJECTS) $(__treelist___win32rc)
+ $(CXX) -o $@ $(TREELIST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
+
+ $(__treelist___mac_setfilecmd)
+ $(__treelist___os2_emxbindcmd)
+
+@COND_PLATFORM_MACOSX_1@treelist.app/Contents/PkgInfo: treelist$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
+@COND_PLATFORM_MACOSX_1@ mkdir -p treelist.app/Contents
+@COND_PLATFORM_MACOSX_1@ mkdir -p treelist.app/Contents/MacOS
+@COND_PLATFORM_MACOSX_1@ mkdir -p treelist.app/Contents/Resources
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
+@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/treelist/" \
+@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \
+@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >treelist.app/Contents/Info.plist
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ echo -n "APPL????" >treelist.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ ln -f treelist$(EXEEXT) treelist.app/Contents/MacOS/treelist
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@
+@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns treelist.app/Contents/Resources/wxmac.icns
+
+@COND_PLATFORM_MACOSX_1@treelist_bundle: $(____treelist_BUNDLE_TGT_REF_DEP)
+
+treelist_sample_rc.o: $(srcdir)/../../samples/sample.rc
+ $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
+
+treelist_treelist.o: $(srcdir)/treelist.cpp
+ $(CXXC) -c -o $@ $(TREELIST_CXXFLAGS) $(srcdir)/treelist.cpp
+
+
+# Include dependency info, if present:
+@IF_GNU_MAKE@-include ./.deps/*.d
+
+.PHONY: all install uninstall clean distclean treelist_bundle
diff --git a/samples/treelist/makefile.bcc b/samples/treelist/makefile.bcc
new file mode 100644
index 0000000000..7707b7d6e9
--- /dev/null
+++ b/samples/treelist/makefile.bcc
@@ -0,0 +1,245 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+.autodepend
+
+!ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
+BCCDIR = $(MAKEDIR)\..
+!endif
+
+!include ../../build/msw/config.bcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = bcc
+OBJS = \
+ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREELIST_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+ $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \
+ -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS = \
+ $(OBJS)\treelist_treelist.obj
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_5 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_5 = mt
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_6 =
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_6 = -tWM
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 =
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_8 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_8 =
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = -dwxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = -DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = -dwxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = -DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = -dwxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = -i$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = -DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treelist.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
+ -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
+ -if exist $(OBJS)\treelist.tds del $(OBJS)\treelist.tds
+ -if exist $(OBJS)\treelist.ilc del $(OBJS)\treelist.ilc
+ -if exist $(OBJS)\treelist.ild del $(OBJS)\treelist.ild
+ -if exist $(OBJS)\treelist.ilf del $(OBJS)\treelist.ilf
+ -if exist $(OBJS)\treelist.ils del $(OBJS)\treelist.ils
+
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
+ c0w32.obj $(TREELIST_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\treelist_sample.res
+|
+
+$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\treelist_treelist.obj: .\treelist.cpp
+ $(CXX) -q -c -P -o$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
new file mode 100644
index 0000000000..c930d9827d
--- /dev/null
+++ b/samples/treelist/makefile.gcc
@@ -0,0 +1,240 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+include ../../build/msw/config.gcc
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF$@.d -MD -MP
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
+OBJS = \
+ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREELIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
+ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
+ -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS = \
+ $(OBJS)\treelist_sample_rc.o \
+ $(OBJS)\treelist_treelist.o
+
+### Conditionally set variables: ###
+
+ifeq ($(GCC_VERSION),2.95)
+GCCFLAGS = -fvtable-thunks
+endif
+ifeq ($(USE_GUI),0)
+PORTNAME = base
+endif
+ifeq ($(USE_GUI),1)
+PORTNAME = msw
+endif
+ifeq ($(BUILD),debug)
+WXDEBUGFLAG = d
+endif
+ifeq ($(UNICODE),1)
+WXUNICODEFLAG = u
+endif
+ifeq ($(WXUNIV),1)
+WXUNIVNAME = univ
+endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
+endif
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =
+endif
+ifeq ($(BUILD),debug)
+__OPTIMIZEFLAG_2 = -O0
+endif
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG_2 = -O2
+endif
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG_5 = -fno-rtti
+endif
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG_5 =
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_6 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_6 =
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+endif
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
+endif
+ifeq ($(DEBUG_FLAG),0)
+__DEBUG_DEFINE_p_1 = --define wxDEBUG_LEVEL=0
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p = -DNDEBUG
+endif
+ifeq ($(BUILD),release)
+__NDEBUG_DEFINE_p_1 = --define NDEBUG
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(UNICODE),0)
+__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=0
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p_1 = --define _UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p = -DWXUSINGDLL
+endif
+ifeq ($(SHARED),1)
+__DLLFLAG_p_1 = --define WXUSINGDLL
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_ADV_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(USE_CAIRO),1)
+__CAIRO_LIB_p = -lcairo
+endif
+ifeq ($(USE_CAIRO),1)
+____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO =
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO =
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
+endif
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG =
+endif
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
+endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treelist.exe
+
+clean:
+ -if exist $(OBJS)\*.o del $(OBJS)\*.o
+ -if exist $(OBJS)\*.d del $(OBJS)\*.d
+ -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
+
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o
+ $(CXX) -o $@ $(TREELIST_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+
+$(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc
+ windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
+
+$(OBJS)\treelist_treelist.o: ./treelist.cpp
+ $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all clean
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include $(OBJS)/*.d
diff --git a/samples/treelist/makefile.unx b/samples/treelist/makefile.unx
new file mode 100644
index 0000000000..bba24e765d
--- /dev/null
+++ b/samples/treelist/makefile.unx
@@ -0,0 +1,100 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+
+
+# -------------------------------------------------------------------------
+# These are configurable options:
+# -------------------------------------------------------------------------
+
+# C++ compiler
+CXX = `$(WX_CONFIG) --cxx`
+
+# Standard flags for C++
+CXXFLAGS ?=
+
+# Standard preprocessor flags (common for CC and CXX)
+CPPFLAGS ?=
+
+# Standard linker flags
+LDFLAGS ?=
+
+# Location and arguments of wx-config script
+WX_CONFIG ?= wx-config
+
+# Port of the wx library to build against [gtk1,gtk2,msw,x11,motif,mgl,osx_cocoa,osx_carbon,dfb]
+WX_PORT ?= $(shell $(WX_CONFIG) --query-toolkit)
+
+# Use DLL build of wx library to use? [0,1]
+WX_SHARED ?= $(shell if test -z `$(WX_CONFIG) --query-linkage`; then echo 1; else echo 0; fi)
+
+# Compile Unicode build of wxWidgets? [0,1]
+WX_UNICODE ?= $(shell $(WX_CONFIG) --query-chartype | sed 's/unicode/1/;s/ansi/0/')
+
+# Version of the wx library to build against.
+WX_VERSION ?= $(shell $(WX_CONFIG) --query-version | sed -e 's/\([0-9]*\)\.\([0-9]*\)/\1\2/')
+
+
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD -MP
+WX_VERSION_MAJOR = $(shell echo $(WX_VERSION) | cut -c1,1)
+WX_VERSION_MINOR = $(shell echo $(WX_VERSION) | cut -c2,2)
+WX_CONFIG_FLAGS = $(WX_CONFIG_UNICODE_FLAG) $(WX_CONFIG_SHARED_FLAG) \
+ --toolkit=$(WX_PORT) --version=$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR)
+TREELIST_CXXFLAGS = -I. `$(WX_CONFIG) --cxxflags $(WX_CONFIG_FLAGS)` $(CPPFLAGS) \
+ $(CXXFLAGS)
+TREELIST_OBJECTS = \
+ treelist_treelist.o
+
+### Conditionally set variables: ###
+
+ifeq ($(WX_UNICODE),0)
+WX_CONFIG_UNICODE_FLAG = --unicode=no
+endif
+ifeq ($(WX_UNICODE),1)
+WX_CONFIG_UNICODE_FLAG = --unicode=yes
+endif
+ifeq ($(WX_SHARED),0)
+WX_CONFIG_SHARED_FLAG = --static=yes
+endif
+ifeq ($(WX_SHARED),1)
+WX_CONFIG_SHARED_FLAG = --static=no
+endif
+
+
+### Targets: ###
+
+all: test_for_selected_wxbuild treelist
+
+install:
+
+uninstall:
+
+clean:
+ rm -f ./*.o
+ rm -f ./*.d
+ rm -f treelist
+
+test_for_selected_wxbuild:
+ @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
+
+treelist: $(TREELIST_OBJECTS)
+ $(CXX) -o $@ $(TREELIST_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs adv,core,base`
+
+treelist_treelist.o: ./treelist.cpp
+ $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<
+
+.PHONY: all install uninstall clean
+
+
+# Dependencies tracking:
+-include ./*.d
diff --git a/samples/treelist/makefile.vc b/samples/treelist/makefile.vc
new file mode 100644
index 0000000000..33866c3e53
--- /dev/null
+++ b/samples/treelist/makefile.vc
@@ -0,0 +1,355 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include <../../build/msw/config.vc>
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = vc
+OBJS = \
+ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(DIR_SUFFIX_CPU)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREELIST_CXXFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME_4) /DWIN32 \
+ $(__DEBUGINFO_0) /Fd$(OBJS)\treelist.pdb $(____DEBUGRUNTIME_3_p) \
+ $(__OPTIMIZEFLAG_6) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
+ $(__MSLU_DEFINE_p) /I$(SETUPHDIR) /I.\..\..\include \
+ $(____CAIRO_INCLUDEDIR_FILENAMES_p) /W4 /I. $(__DLLFLAG_p) /D_WINDOWS \
+ /I.\..\..\samples /DNOPCH $(__RTTIFLAG_11) $(__EXCEPTIONSFLAG_12) \
+ $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS = \
+ $(OBJS)\treelist_treelist.obj
+TREELIST_RESOURCES = \
+ $(OBJS)\treelist_sample.res
+
+### Conditionally set variables: ###
+
+!if "$(USE_GUI)" == "0"
+PORTNAME = base
+!endif
+!if "$(USE_GUI)" == "1"
+PORTNAME = msw
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+WXDEBUGFLAG = d
+!endif
+!if "$(UNICODE)" == "1"
+WXUNICODEFLAG = u
+!endif
+!if "$(WXUNIV)" == "1"
+WXUNIVNAME = univ
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+DIR_SUFFIX_CPU = _amd64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+DIR_SUFFIX_CPU = _ia64
+!endif
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll
+!endif
+!if "$(SHARED)" == "0"
+LIBTYPE_SUFFIX = lib
+!endif
+!if "$(SHARED)" == "1"
+LIBTYPE_SUFFIX = dll
+!endif
+!if "$(TARGET_CPU)" == "AMD64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "IA64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(TARGET_CPU)" == "amd64"
+LINK_TARGET_CPU = /MACHINE:X64
+!endif
+!if "$(TARGET_CPU)" == "ia64"
+LINK_TARGET_CPU = /MACHINE:IA64
+!endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_0 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_0 = /Zi
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_1 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO_2 =
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO_2 = $(__DEBUGRUNTIME_5)
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p = /D_DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+____DEBUGRUNTIME_3_p_1 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+____DEBUGRUNTIME_3_p_1 = /d _DEBUG
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_4 =
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_4 = d
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__DEBUGRUNTIME_5 = /opt:ref /opt:icf
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "1"
+__DEBUGRUNTIME_5 =
+!endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_6 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_6 = /O2
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREADSFLAG_9 = L
+!endif
+!if "$(USE_THREADS)" == "1"
+__THREADSFLAG_9 = T
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_10 = D
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_10 = $(__THREADSFLAG_9)
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTIFLAG_11 =
+!endif
+!if "$(USE_RTTI)" == "1"
+__RTTIFLAG_11 = /GR
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONSFLAG_12 =
+!endif
+!if "$(USE_EXCEPTIONS)" == "1"
+__EXCEPTIONSFLAG_12 = /EHsc
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1"
+__NO_VC_CRTDBG_p_1 = /d __NO_VC_CRTDBG__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = /d __WXUNIVERSAL__
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0
+!endif
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = /d wxDEBUG_LEVEL=0
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p = /DNDEBUG
+!endif
+!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(DEBUG_RUNTIME_LIBS)" == "0"
+__NDEBUG_DEFINE_p_1 = /d NDEBUG
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS
+!endif
+!if "$(USE_EXCEPTIONS)" == "0"
+__EXCEPTIONS_DEFINE_p_1 = /d wxNO_EXCEPTIONS
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p = /DwxNO_RTTI
+!endif
+!if "$(USE_RTTI)" == "0"
+__RTTI_DEFINE_p_1 = /d wxNO_RTTI
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p = /DwxNO_THREADS
+!endif
+!if "$(USE_THREADS)" == "0"
+__THREAD_DEFINE_p_1 = /d wxNO_THREADS
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = /D_UNICODE
+!endif
+!if "$(UNICODE)" == "0"
+__UNICODE_DEFINE_p_1 = /d wxUSE_UNICODE=0
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = /d _UNICODE
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = /d wxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_p = /I$(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_INCLUDEDIR_FILENAMES_1_p = /i $(CAIRO_ROOT)\include\cairo
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p = /DWXUSINGDLL
+!endif
+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = /d WXUSINGDLL
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_ADV_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+__CAIRO_LIB_p = cairo.lib
+!endif
+!if "$(USE_CAIRO)" == "1"
+____CAIRO_LIBDIR_FILENAMES_p = /LIBPATH:$(CAIRO_ROOT)\lib
+!endif
+
+
+all: $(OBJS)
+$(OBJS):
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all: $(OBJS)\treelist.exe
+
+clean:
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
+ -if exist $(OBJS)\treelist.ilk del $(OBJS)\treelist.ilk
+ -if exist $(OBJS)\treelist.pdb del $(OBJS)\treelist.pdb
+
+$(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res
+ link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\treelist.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
+ $(TREELIST_OBJECTS) $(TREELIST_RESOURCES) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib
+<<
+
+$(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
+ rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
+
+$(OBJS)\treelist_treelist.obj: .\treelist.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(TREELIST_CXXFLAGS) .\treelist.cpp
diff --git a/samples/treelist/makefile.wat b/samples/treelist/makefile.wat
new file mode 100644
index 0000000000..3efad3b09e
--- /dev/null
+++ b/samples/treelist/makefile.wat
@@ -0,0 +1,272 @@
+# =========================================================================
+# This makefile was generated by
+# Bakefile 0.2.9 (http://www.bakefile.org)
+# Do not modify, all changes will be overwritten!
+# =========================================================================
+
+!include ../../build/msw/config.wat
+
+# -------------------------------------------------------------------------
+# Do not modify the rest of this file!
+# -------------------------------------------------------------------------
+
+# Speed up compilation a bit:
+!ifdef __LOADDLL__
+! loaddll wcc wccd
+! loaddll wccaxp wccdaxp
+! loaddll wcc386 wccd386
+! loaddll wpp wppdi86
+! loaddll wppaxp wppdaxp
+! loaddll wpp386 wppd386
+! if $(__VERSION__) >= 1280
+! loaddll wlink wlinkd
+! else
+! loaddll wlink wlink
+! endif
+! loaddll wlib wlibd
+!endif
+
+# We need these variables in some bakefile-made rules:
+WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
+
+### Conditionally set variables: ###
+
+PORTNAME =
+!ifeq USE_GUI 0
+PORTNAME = base
+!endif
+!ifeq USE_GUI 1
+PORTNAME = msw
+!endif
+WXDEBUGFLAG =
+!ifeq BUILD debug
+WXDEBUGFLAG = d
+!endif
+WXUNICODEFLAG =
+!ifeq UNICODE 1
+WXUNICODEFLAG = u
+!endif
+WXUNIVNAME =
+!ifeq WXUNIV 1
+WXUNIVNAME = univ
+!endif
+WXDLLFLAG =
+!ifeq SHARED 1
+WXDLLFLAG = dll
+!endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE =
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =
+!endif
+__DEBUGINFO_0 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d2
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_0 = -d0
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_0 = -d0
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_0 = -d2
+!endif
+__DEBUGINFO_1 =
+!ifeq BUILD debug
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 = debug all
+!endif
+!endif
+!ifeq BUILD release
+!ifeq DEBUG_INFO default
+__DEBUGINFO_1 =
+!endif
+!endif
+!ifeq DEBUG_INFO 0
+__DEBUGINFO_1 =
+!endif
+!ifeq DEBUG_INFO 1
+__DEBUGINFO_1 = debug all
+!endif
+__OPTIMIZEFLAG_2 =
+!ifeq BUILD debug
+__OPTIMIZEFLAG_2 = -od
+!endif
+!ifeq BUILD release
+__OPTIMIZEFLAG_2 = -ot -ox
+!endif
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 =
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
+!ifeq RUNTIME_LIBS dynamic
+__RUNTIME_LIBS_6 = -br
+!endif
+!ifeq RUNTIME_LIBS static
+__RUNTIME_LIBS_6 =
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 =
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
+!endif
+__EXCEPTIONSFLAG_8 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_8 =
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_8 = -xs
+!endif
+__WXLIB_ADV_p =
+!ifeq MONOLITHIC 0
+__WXLIB_ADV_p = &
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__WXLIB_BASE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_BASE_p = &
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__WXLIB_MONO_p =
+!ifeq MONOLITHIC 1
+__WXLIB_MONO_p = &
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+__LIB_TIFF_p =
+!ifeq USE_GUI 1
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif
+__LIB_JPEG_p =
+!ifeq USE_GUI 1
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+__LIB_PNG_p =
+!ifeq USE_GUI 1
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+__CAIRO_LIB_p =
+!ifeq USE_CAIRO 1
+__CAIRO_LIB_p = cairo.lib
+!endif
+____CAIRO_LIBDIR_FILENAMES_p =
+!ifeq USE_CAIRO 1
+____CAIRO_LIBDIR_FILENAMES_p = libpath $(CAIRO_ROOT)\lib
+!endif
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0
+!endif
+__NDEBUG_DEFINE_p =
+!ifeq BUILD release
+__NDEBUG_DEFINE_p = -dNDEBUG
+!endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
+!endif
+____CAIRO_INCLUDEDIR_FILENAMES =
+!ifeq USE_CAIRO 1
+____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo
+!endif
+__DLLFLAG_p =
+!ifeq SHARED 1
+__DLLFLAG_p = -dWXUSINGDLL
+!endif
+
+### Variables: ###
+
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
+OBJS = &
+ $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = &
+ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+TREELIST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+ $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) &
+ -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 &
+ -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
+ $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+TREELIST_OBJECTS = &
+ $(OBJS)\treelist_treelist.obj
+
+
+all : $(OBJS)
+$(OBJS) :
+ -if not exist $(OBJS) mkdir $(OBJS)
+
+### Targets: ###
+
+all : .SYMBOLIC $(OBJS)\treelist.exe
+
+clean : .SYMBOLIC
+ -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+ -if exist $(OBJS)\*.res del $(OBJS)\*.res
+ -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
+ -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
+ -if exist $(OBJS)\*.pch del $(OBJS)\*.pch
+ -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
+
+$(OBJS)\treelist.exe : $(TREELIST_OBJECTS) $(OBJS)\treelist_sample.res
+ @%create $(OBJS)\treelist.lbc
+ @%append $(OBJS)\treelist.lbc option quiet
+ @%append $(OBJS)\treelist.lbc name $^@
+ @%append $(OBJS)\treelist.lbc option caseexact
+ @%append $(OBJS)\treelist.lbc $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)
+ @for %i in ($(TREELIST_OBJECTS)) do @%append $(OBJS)\treelist.lbc file %i
+ @for %i in ( $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\treelist.lbc library %i
+ @%append $(OBJS)\treelist.lbc option resource=$(OBJS)\treelist_sample.res
+ @for %i in () do @%append $(OBJS)\treelist.lbc option stack=%i
+ wlink @$(OBJS)\treelist.lbc
+
+$(OBJS)\treelist_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+
+$(OBJS)\treelist_treelist.obj : .AUTODEPEND .\treelist.cpp
+ $(CXX) -bt=nt -zq -fo=$^@ $(TREELIST_CXXFLAGS) $<
diff --git a/samples/treelist/treelist.bkl b/samples/treelist/treelist.bkl
new file mode 100644
index 0000000000..4516ab9f67
--- /dev/null
+++ b/samples/treelist/treelist.bkl
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+ treelist.cpp
+ adv
+ core
+ base
+
+
+
diff --git a/samples/treelist/treelist.cpp b/samples/treelist/treelist.cpp
new file mode 100644
index 0000000000..13894529af
--- /dev/null
+++ b/samples/treelist/treelist.cpp
@@ -0,0 +1,604 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: samples/treelist/treelist.cpp
+// Purpose: Sample showing wxTreeListCtrl.
+// Author: Vadim Zeitlin
+// Created: 2011-08-19
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin
+// Licence: wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// Declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Headers
+// ----------------------------------------------------------------------------
+
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
+
+#if !wxUSE_TREELISTCTRL
+ #error "wxUSE_TREELISTCTRL must be 1 for this sample."
+#endif
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/frame.h"
+ #include "wx/log.h"
+ #include "wx/menu.h"
+ #include "wx/sizer.h"
+ #include "wx/statusbr.h"
+ #include "wx/textctrl.h"
+#endif
+
+#include "wx/treelist.h"
+
+#include "wx/aboutdlg.h"
+#include "wx/artprov.h"
+
+// ----------------------------------------------------------------------------
+// Resources
+// ----------------------------------------------------------------------------
+
+#if !defined(__WXMSW__) && !defined(__WXPM__)
+ #include "../sample.xpm"
+#endif
+
+// ----------------------------------------------------------------------------
+// Constants for menu items
+// ----------------------------------------------------------------------------
+
+enum
+{
+ Id_MultiSelect = 100,
+ Id_FlatList,
+
+ Id_Checkboxes_Start,
+ Id_NoCheckboxes = Id_Checkboxes_Start,
+ Id_Checkboxes2State,
+ Id_Checkboxes3State,
+ Id_CheckboxesUser3State,
+ Id_Checkboxes_End,
+
+ Id_DumpSelection,
+ Id_Check_HTMLDocs,
+ Id_Uncheck_HTMLDocs,
+ Id_Indet_HTMLDocs,
+ Id_Select_HTMLDocs
+};
+
+// ----------------------------------------------------------------------------
+// Application class
+// ----------------------------------------------------------------------------
+
+class MyApp : public wxApp
+{
+public:
+ virtual bool OnInit();
+};
+
+// ----------------------------------------------------------------------------
+// Main window class
+// ----------------------------------------------------------------------------
+
+class MyFrame : public wxFrame
+{
+public:
+ MyFrame();
+ virtual ~MyFrame();
+
+private:
+ // Event handlers for the menu and wxTreeListCtrl events.
+ void OnMultiSelect(wxCommandEvent& event);
+ void OnFlatList(wxCommandEvent& event);
+ void OnCheckboxes(wxCommandEvent& event);
+ void OnDumpSelection(wxCommandEvent& event);
+ void OnCheckHTMLDocs(wxCommandEvent& event);
+ void OnSelectHTMLDocs(wxCommandEvent& event);
+
+ void OnAbout(wxCommandEvent& event);
+ void OnExit(wxCommandEvent& event);
+
+ void OnSelectionChanged(wxTreeListEvent& event);
+ void OnItemExpanding(wxTreeListEvent& event);
+ void OnItemExpanded(wxTreeListEvent& event);
+ void OnItemChecked(wxTreeListEvent& event);
+ void OnItemActivated(wxTreeListEvent& event);
+ void OnItemContextMenu(wxTreeListEvent& event);
+
+
+ enum
+ {
+ Icon_File,
+ Icon_FolderClosed,
+ Icon_FolderOpened
+ };
+
+ // Create the image list, called once only. Should add images to it in the
+ // same order as they appear in the enum above.
+ void InitImageList();
+
+ // Create the control with the given styles.
+ wxTreeListCtrl* CreateTreeListCtrl(long style);
+
+ // Recreate an already existing control.
+ void RecreateTreeListCtrl(long style);
+
+ // Helper: return the text of the item or "NONE" if the item is invalid.
+ wxString DumpItem(wxTreeListItem item) const;
+
+ // Another helper: just translate wxCheckBoxState to user-readable text.
+ static const char* CheckedStateString(wxCheckBoxState state);
+
+
+ wxImageList* m_imageList;
+
+ wxTreeListCtrl* m_treelist;
+
+ wxTreeListItem m_itemHTMLDocs;
+
+ wxLog* m_oldLogTarget;
+
+ bool m_isFlat;
+
+ wxDECLARE_EVENT_TABLE();
+};
+
+// ============================================================================
+// Implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// Application class
+// ----------------------------------------------------------------------------
+
+wxIMPLEMENT_APP(MyApp);
+
+bool MyApp::OnInit()
+{
+ if ( !wxApp::OnInit() )
+ return false;
+
+ new MyFrame;
+
+ return true;
+}
+
+// ----------------------------------------------------------------------------
+// Main window class
+// ----------------------------------------------------------------------------
+
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+ EVT_MENU(Id_MultiSelect, MyFrame::OnMultiSelect)
+ EVT_MENU(Id_FlatList, MyFrame::OnFlatList)
+ EVT_MENU_RANGE(Id_Checkboxes_Start, Id_Checkboxes_End,
+ MyFrame::OnCheckboxes)
+
+ EVT_MENU(Id_DumpSelection, MyFrame::OnDumpSelection)
+ EVT_MENU_RANGE(Id_Check_HTMLDocs, Id_Indet_HTMLDocs,
+ MyFrame::OnCheckHTMLDocs)
+ EVT_MENU(Id_Select_HTMLDocs, MyFrame::OnSelectHTMLDocs)
+
+ EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+ EVT_MENU(wxID_EXIT, MyFrame::OnExit)
+
+ EVT_TREELIST_SELECTION_CHANGED(wxID_ANY, MyFrame::OnSelectionChanged)
+ EVT_TREELIST_ITEM_EXPANDING(wxID_ANY, MyFrame::OnItemExpanding)
+ EVT_TREELIST_ITEM_EXPANDED(wxID_ANY, MyFrame::OnItemExpanded)
+ EVT_TREELIST_ITEM_CHECKED(wxID_ANY, MyFrame::OnItemChecked)
+ EVT_TREELIST_ITEM_ACTIVATED(wxID_ANY, MyFrame::OnItemActivated)
+ EVT_TREELIST_ITEM_CONTEXT_MENU(wxID_ANY, MyFrame::OnItemContextMenu)
+END_EVENT_TABLE()
+
+MyFrame::MyFrame()
+ : wxFrame(NULL, wxID_ANY, "wxWidgets tree/list control sample",
+ wxDefaultPosition, wxSize(600, 450))
+{
+ m_isFlat = false;
+
+ // Create menus and status bar.
+ SetIcon(wxICON(sample));
+
+ wxMenu* fileMenu = new wxMenu;
+ fileMenu->Append(wxID_EXIT);
+
+ wxMenu* treeStyle = new wxMenu;
+ treeStyle->AppendCheckItem(Id_MultiSelect, "&Multiple selections\tCtrl-M");
+ treeStyle->AppendSeparator();
+ treeStyle->AppendRadioItem(Id_NoCheckboxes,
+ "&No checkboxes\tCtrl-1");
+ treeStyle->AppendRadioItem(Id_Checkboxes2State,
+ "&2-state checkboxes\tCtrl-2");
+ treeStyle->AppendRadioItem(Id_Checkboxes3State,
+ "&3-state checkboxes\tCtrl-3");
+ treeStyle->AppendRadioItem(Id_CheckboxesUser3State,
+ "&User-settable 3-state checkboxes\tCtrl-4");
+ treeStyle->AppendSeparator();
+ treeStyle->AppendCheckItem(Id_FlatList, "&Flat list");
+
+ wxMenu* treeOper = new wxMenu;
+ treeOper->Append(Id_DumpSelection, "&Dump selection\tCtrl-D");
+ treeOper->AppendSeparator();
+ treeOper->Append(Id_Check_HTMLDocs, "&Check Doc/HTML item\tCtrl-C");
+ treeOper->Append(Id_Uncheck_HTMLDocs, "&Uncheck Doc/HTML item\tCtrl-U");
+ treeOper->Append(Id_Indet_HTMLDocs, "Make Doc/HTML &indeterminate\tCtrl-I");
+ treeOper->Append(Id_Select_HTMLDocs, "&Select Doc/HTML item\tCtrl-S");
+
+ wxMenu* helpMenu = new wxMenu;
+ helpMenu->Append(wxID_ABOUT);
+
+ wxMenuBar* menuBar = new wxMenuBar();
+ menuBar->Append(fileMenu, "&File");
+ menuBar->Append(treeStyle, "&Style");
+ menuBar->Append(treeOper, "&Operations");
+ menuBar->Append(helpMenu, "&Help");
+ SetMenuBar(menuBar);
+
+ CreateStatusBar(1);
+
+
+ // Construct the image list with the standard images.
+ InitImageList();
+
+
+ // Create and layout child controls.
+ m_treelist = CreateTreeListCtrl(wxTL_DEFAULT_STYLE);
+
+ wxTextCtrl* textLog = new wxTextCtrl(this, wxID_ANY, "",
+ wxDefaultPosition, wxDefaultSize,
+ wxTE_READONLY | wxTE_MULTILINE);
+ m_oldLogTarget = wxLog::SetActiveTarget(new wxLogTextCtrl(textLog));
+
+ wxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+ sizer->Add(m_treelist, wxSizerFlags(2).Expand());
+ sizer->Add(textLog, wxSizerFlags(1).Expand());
+ SetSizer(sizer);
+
+
+ // Finally show everything.
+ Show();
+}
+
+MyFrame::~MyFrame()
+{
+ delete m_imageList;
+
+ delete wxLog::SetActiveTarget(m_oldLogTarget);
+}
+
+void MyFrame::InitImageList()
+{
+ wxSize iconSize = wxArtProvider::GetSizeHint(wxART_LIST);
+ if ( iconSize == wxDefaultSize )
+ iconSize = wxSize(16, 16);
+
+ m_imageList = new wxImageList(iconSize.x, iconSize.y);
+
+ // The order should be the same as for the enum elements.
+ static const char* const icons[] =
+ {
+ wxART_NORMAL_FILE,
+ wxART_FOLDER,
+ wxART_FOLDER_OPEN
+ };
+
+ for ( unsigned n = 0; n < WXSIZEOF(icons); n++ )
+ {
+ m_imageList->Add
+ (
+ wxArtProvider::GetIcon(icons[n], wxART_LIST, iconSize)
+ );
+ }
+}
+
+wxTreeListCtrl* MyFrame::CreateTreeListCtrl(long style)
+{
+ wxTreeListCtrl* const
+ tree = new wxTreeListCtrl(this, wxID_ANY,
+ wxDefaultPosition, wxDefaultSize,
+ style);
+ tree->SetImageList(m_imageList);
+
+ enum
+ {
+ Col_Component,
+ Col_Files,
+ Col_Size
+ };
+
+ tree->AppendColumn("Component");
+ tree->AppendColumn("# Files",
+ tree->WidthFor("1,000,000"),
+ wxALIGN_RIGHT);
+ tree->AppendColumn("Size",
+ tree->WidthFor("1,000,000 KiB"),
+ wxALIGN_RIGHT);
+
+ // Define a shortcut to save on typing here.
+ #define ADD_ITEM(item, parent, files, size) \
+ wxTreeListItem item = tree->AppendItem(m_isFlat ? root : parent, \
+ #item, \
+ Icon_FolderClosed, \
+ Icon_FolderOpened); \
+ tree->SetItemText(item, Col_Files, files); \
+ tree->SetItemText(item, Col_Size, size)
+
+ wxTreeListItem root = tree->GetRootItem();
+ ADD_ITEM(Code, root, "", "");
+ ADD_ITEM(wxMSW, Code, "313", "3.94 MiB");
+ ADD_ITEM(wxGTK, Code, "180", "1.66 MiB");
+
+ ADD_ITEM(wxOSX, Code, "265", "2.36 MiB");
+ ADD_ITEM(Core, wxOSX, "31", "347 KiB");
+ ADD_ITEM(Carbon, wxOSX, "91", "1.34 MiB");
+ ADD_ITEM(Cocoa, wxOSX, "46", "512 KiB");
+
+ ADD_ITEM(Documentation, root, "", "");
+ ADD_ITEM(HTML, Documentation, "many", "");
+ ADD_ITEM(CHM, Documentation, "1", "");
+
+ ADD_ITEM(Samples, root, "", "");
+ ADD_ITEM(minimal, Samples, "1", "7 KiB");
+ ADD_ITEM(widgets, Samples, "28", "419 KiB");
+
+ #undef ADD_ITEM
+
+ // Remember this one for subsequent tests.
+ m_itemHTMLDocs = HTML;
+
+ return tree;
+}
+
+void MyFrame::RecreateTreeListCtrl(long style)
+{
+ wxTreeListCtrl* const treelist = CreateTreeListCtrl(style);
+ GetSizer()->Replace(m_treelist, treelist);
+
+ delete m_treelist;
+ m_treelist = treelist;
+
+ Layout();
+}
+
+void MyFrame::OnMultiSelect(wxCommandEvent& event)
+{
+ long style = m_treelist->GetWindowStyle();
+
+ if ( event.IsChecked() )
+ style |= wxTL_MULTIPLE;
+ else
+ style &= ~wxTL_MULTIPLE;
+
+ RecreateTreeListCtrl(style);
+}
+
+void MyFrame::OnFlatList(wxCommandEvent& event)
+{
+ m_isFlat = event.IsChecked();
+
+ RecreateTreeListCtrl(m_treelist->GetWindowStyle());
+}
+
+void MyFrame::OnCheckboxes(wxCommandEvent& event)
+{
+ long style = m_treelist->GetWindowStyle();
+ style &= ~(wxTL_CHECKBOX | wxTL_3STATE | wxTL_USER_3STATE);
+
+ switch ( event.GetId() )
+ {
+ case Id_NoCheckboxes:
+ break;
+
+ case Id_Checkboxes2State:
+ style |= wxTL_CHECKBOX;
+ break;
+
+ case Id_Checkboxes3State:
+ style |= wxTL_3STATE;
+ break;
+
+ case Id_CheckboxesUser3State:
+ style |= wxTL_USER_3STATE;
+ break;
+
+ default:
+ wxFAIL_MSG( "Unknown checkbox style" );
+ return;
+ }
+
+ RecreateTreeListCtrl(style);
+}
+
+void MyFrame::OnDumpSelection(wxCommandEvent& WXUNUSED(event))
+{
+ if ( m_treelist->HasFlag(wxTL_MULTIPLE) )
+ {
+ wxTreeListItems selections;
+ const unsigned numSelected = m_treelist->GetSelections(selections);
+
+ switch ( numSelected )
+ {
+ case 0:
+ wxLogMessage("No items selected");
+ break;
+
+ case 1:
+ wxLogMessage("Single item selected: %s",
+ DumpItem(selections[0]));
+ break;
+
+ default:
+ wxLogMessage("%u items selected:", numSelected);
+ for ( unsigned n = 0; n < numSelected; n++ )
+ {
+ wxLogMessage("\t%s", DumpItem(selections[n]));
+ }
+ }
+ }
+ else // Single selection
+ {
+ wxLogMessage("Selection: %s", DumpItem(m_treelist->GetSelection()));
+ }
+}
+
+void MyFrame::OnCheckHTMLDocs(wxCommandEvent& event)
+{
+ wxCheckBoxState state;
+
+ switch ( event.GetId() )
+ {
+ case Id_Uncheck_HTMLDocs:
+ state = wxCHK_UNCHECKED;
+ break;
+
+ case Id_Check_HTMLDocs:
+ state = wxCHK_CHECKED;
+ break;
+
+ case Id_Indet_HTMLDocs:
+ state = wxCHK_UNDETERMINED;
+ break;
+
+ default:
+ wxFAIL_MSG( "Unknown check state" );
+ return;
+ }
+
+ m_treelist->CheckItem(m_itemHTMLDocs, state);
+}
+
+void MyFrame::OnSelectHTMLDocs(wxCommandEvent& WXUNUSED(event))
+{
+ m_treelist->Select(m_itemHTMLDocs);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+ wxAboutDialogInfo info;
+ info.SetDescription("wxTreeListCtrl wxWidgets sample.");
+ info.SetCopyright("(C) 2011 Vadim Zeitlin ");
+
+ wxAboutBox(info);
+}
+
+void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event))
+{
+ Close(true);
+}
+
+wxString MyFrame::DumpItem(wxTreeListItem item) const
+{
+ return item.IsOk() ? m_treelist->GetItemText(item) : wxString("NONE");
+}
+
+/* static */
+const char* MyFrame::CheckedStateString(wxCheckBoxState state)
+{
+ switch ( state )
+ {
+ case wxCHK_UNCHECKED:
+ return "unchecked";
+
+ case wxCHK_UNDETERMINED:
+ return "undetermined";
+
+ case wxCHK_CHECKED:
+ return "checked";
+ }
+
+ return "invalid";
+}
+
+void MyFrame::OnSelectionChanged(wxTreeListEvent& event)
+{
+ const char* msg;
+
+ if ( m_treelist->HasFlag(wxTL_MULTIPLE) )
+ msg = "Selection of the \"%s\" item changed.";
+ else
+ msg = "Selection changed, now is \"%s\".";
+
+ wxLogMessage(msg, DumpItem(event.GetItem()));
+}
+
+void MyFrame::OnItemExpanding(wxTreeListEvent& event)
+{
+ wxLogMessage("Item \"%s\" is expanding", DumpItem(event.GetItem()));
+}
+
+void MyFrame::OnItemExpanded(wxTreeListEvent& event)
+{
+ wxLogMessage("Item \"%s\" expanded", DumpItem(event.GetItem()));
+}
+
+void MyFrame::OnItemChecked(wxTreeListEvent& event)
+{
+ wxTreeListItem item = event.GetItem();
+
+ wxLogMessage("Item \"%s\" toggled, now %s (was %s)",
+ DumpItem(item),
+ CheckedStateString(m_treelist->GetCheckedState(item)),
+ CheckedStateString(event.GetOldCheckedState()));
+}
+
+void MyFrame::OnItemActivated(wxTreeListEvent& event)
+{
+ wxLogMessage("Item \"%s\" activated", DumpItem(event.GetItem()));
+}
+
+void MyFrame::OnItemContextMenu(wxTreeListEvent& event)
+{
+ enum
+ {
+ Id_Check_Item,
+ Id_Uncheck_Item,
+ Id_Indet_Item,
+ Id_Check_Recursively,
+ Id_Update_Parent
+ };
+
+ wxMenu menu;
+ menu.Append(Id_Check_Item, "&Check item");
+ menu.Append(Id_Uncheck_Item, "&Uncheck item");
+ if ( m_treelist->HasFlag(wxTL_3STATE) )
+ menu.Append(Id_Indet_Item, "Make item &indeterminate");
+ menu.AppendSeparator();
+ menu.Append(Id_Check_Recursively, "Check &recursively");
+ menu.Append(Id_Update_Parent, "Update &parent");
+
+ const wxTreeListItem item = event.GetItem();
+ switch ( m_treelist->GetPopupMenuSelectionFromUser(menu) )
+ {
+ case Id_Check_Item:
+ m_treelist->CheckItem(item);
+ break;
+
+ case Id_Uncheck_Item:
+ m_treelist->UncheckItem(item);
+ break;
+
+ case Id_Indet_Item:
+ m_treelist->CheckItem(item, wxCHK_UNDETERMINED);
+ break;
+
+ case Id_Check_Recursively:
+ m_treelist->CheckItemRecursively(item);
+ break;
+
+ case Id_Update_Parent:
+ m_treelist->UpdateItemParentStateRecursively(item);
+ break;
+
+ default:
+ wxFAIL_MSG( "Unexpected menu selection" );
+ // Fall through.
+
+ case wxID_NONE:
+ return;
+ }
+}
diff --git a/samples/treelist/treelist.dsp b/samples/treelist/treelist.dsp
new file mode 100644
index 0000000000..1cda356c04
--- /dev/null
+++ b/samples/treelist/treelist.dsp
@@ -0,0 +1,263 @@
+# Microsoft Developer Studio Project File - Name="treelist" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Application" 0x0101
+
+CFG=treelist - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "treelist.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "treelist.mak" CFG="treelist - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "treelist - Win32 DLL Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 DLL Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 DLL Release" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 DLL Debug" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 Universal Release" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 Universal Debug" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "treelist - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "treelist - Win32 DLL Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivudll"
+# PROP BASE Intermediate_Dir "vc_mswunivudll\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivudll"
+# PROP Intermediate_Dir "vc_mswunivudll\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivudll\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\treelist.exe" /debug /pdb:"vc_mswunivudll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivudll\treelist.exe" /debug /pdb:"vc_mswunivudll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 DLL Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivuddll"
+# PROP BASE Intermediate_Dir "vc_mswunivuddll\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivuddll"
+# PROP Intermediate_Dir "vc_mswunivuddll\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivuddll\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswunivud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\treelist.exe" /debug /pdb:"vc_mswunivuddll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivuddll\treelist.exe" /debug /pdb:"vc_mswunivuddll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 DLL Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswudll"
+# PROP BASE Intermediate_Dir "vc_mswudll\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswudll"
+# PROP Intermediate_Dir "vc_mswudll\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswudll\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_dll\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswu" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\treelist.exe" /debug /pdb:"vc_mswudll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswudll\treelist.exe" /debug /pdb:"vc_mswudll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswuddll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswuddll"
+# PROP Intermediate_Dir "vc_mswuddll\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswuddll\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_dll\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_dll\mswud" /i ".\..\..\include" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\treelist.exe" /debug /pdb:"vc_mswuddll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+# ADD LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswuddll\treelist.exe" /debug /pdb:"vc_mswuddll\treelist.pdb" /libpath:".\..\..\lib\vc_dll" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 Universal Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivu"
+# PROP BASE Intermediate_Dir "vc_mswunivu\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivu"
+# PROP Intermediate_Dir "vc_mswunivu\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswunivu\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\treelist.exe" /debug /pdb:"vc_mswunivu\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv29u_adv.lib wxmswuniv29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivu\treelist.exe" /debug /pdb:"vc_mswunivu\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 Universal Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswunivud"
+# PROP BASE Intermediate_Dir "vc_mswunivud\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswunivud"
+# PROP Intermediate_Dir "vc_mswunivud\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswunivud\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswunivud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswunivud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\treelist.exe" /debug /pdb:"vc_mswunivud\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmswuniv29ud_adv.lib wxmswuniv29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswunivud\treelist.exe" /debug /pdb:"vc_mswunivud\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswu"
+# PROP BASE Intermediate_Dir "vc_mswu\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswu"
+# PROP Intermediate_Dir "vc_mswu\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /Zi /Fdvc_mswu\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MD /Zi /Fdvc_mswu\treelist.pdb /opt:ref /opt:icf /O2 /GR /EHsc /I ".\..\..\lib\vc_lib\mswu" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswu" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\treelist.exe" /debug /pdb:"vc_mswu\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw29u_adv.lib wxmsw29u_core.lib wxbase29u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswu\treelist.exe" /debug /pdb:"vc_mswu\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ELSEIF "$(CFG)" == "treelist - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "vc_mswud"
+# PROP BASE Intermediate_Dir "vc_mswud\treelist"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "vc_mswud"
+# PROP Intermediate_Dir "vc_mswud\treelist"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Zi /Fdvc_mswud\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD CPP /nologo /FD /MDd /Zi /Fdvc_mswud\treelist.pdb /Od /Gm /GR /EHsc /I ".\..\..\lib\vc_lib\mswud" /I ".\..\..\include" /W4 /I "." /I ".\..\..\samples" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i ".\..\..\lib\vc_lib\mswud" /i ".\..\..\include" /i "." /d "_WINDOWS" /i ".\..\..\samples" /d NOPCH
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\treelist.exe" /debug /pdb:"vc_mswud\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+# ADD LINK32 wxmsw29ud_adv.lib wxmsw29ud_core.lib wxbase29ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /nologo /machine:i386 /out:"vc_mswud\treelist.exe" /debug /pdb:"vc_mswud\treelist.pdb" /libpath:".\..\..\lib\vc_lib" /subsystem:windows
+
+!ENDIF
+
+# Begin Target
+
+# Name "treelist - Win32 DLL Universal Release"
+# Name "treelist - Win32 DLL Universal Debug"
+# Name "treelist - Win32 DLL Release"
+# Name "treelist - Win32 DLL Debug"
+# Name "treelist - Win32 Universal Release"
+# Name "treelist - Win32 Universal Debug"
+# Name "treelist - Win32 Release"
+# Name "treelist - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\..\..\samples\sample.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\treelist.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/samples/treelist/treelist_vc7.vcproj b/samples/treelist/treelist_vc7.vcproj
new file mode 100644
index 0000000000..9f376ef4ee
--- /dev/null
+++ b/samples/treelist/treelist_vc7.vcproj
@@ -0,0 +1,560 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/treelist/treelist_vc8.vcproj b/samples/treelist/treelist_vc8.vcproj
new file mode 100644
index 0000000000..1667bd52a6
--- /dev/null
+++ b/samples/treelist/treelist_vc8.vcproj
@@ -0,0 +1,825 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/treelist/treelist_vc9.vcproj b/samples/treelist/treelist_vc9.vcproj
new file mode 100644
index 0000000000..0fa411e16b
--- /dev/null
+++ b/samples/treelist/treelist_vc9.vcproj
@@ -0,0 +1,797 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/samples/widgets/dirpicker.cpp b/samples/widgets/dirpicker.cpp
index 13a664bc8a..7bdfc69d34 100644
--- a/samples/widgets/dirpicker.cpp
+++ b/samples/widgets/dirpicker.cpp
@@ -100,7 +100,8 @@ protected:
wxCheckBox *m_chkDirTextCtrl,
*m_chkDirChangeDir,
- *m_chkDirMustExist;
+ *m_chkDirMustExist,
+ *m_chkSmall;
wxBoxSizer *m_sizer;
private:
@@ -148,6 +149,7 @@ void DirPickerWidgetsPage::CreateContent()
m_chkDirTextCtrl = CreateCheckBoxAndAddToSizer(dirbox, wxT("With textctrl"), false);
m_chkDirMustExist = CreateCheckBoxAndAddToSizer(dirbox, wxT("Dir must exist"), false);
m_chkDirChangeDir = CreateCheckBoxAndAddToSizer(dirbox, wxT("Change working dir"), false);
+ m_chkSmall = CreateCheckBoxAndAddToSizer(dirbox, "&Small version", false);
boxleft->Add(dirbox, 0, wxALL|wxGROW, 5);
boxleft->Add(new wxButton(this, PickerPage_Reset, wxT("&Reset")),
@@ -162,7 +164,7 @@ void DirPickerWidgetsPage::CreateContent()
// right pane
m_sizer = new wxBoxSizer(wxVERTICAL);
m_sizer->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
- m_sizer->Add(m_dirPicker, 0, wxALIGN_CENTER|wxALL, 5);
+ m_sizer->Add(m_dirPicker, 0, wxEXPAND|wxALL, 5);
m_sizer->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
// global pane
@@ -196,6 +198,9 @@ long DirPickerWidgetsPage::GetPickerStyle()
if ( m_chkDirChangeDir->GetValue() )
style |= wxDIRP_CHANGE_DIR;
+ if ( m_chkSmall->GetValue() )
+ style |= wxDIRP_SMALL;
+
return style;
}
@@ -203,7 +208,7 @@ void DirPickerWidgetsPage::RecreatePicker()
{
m_sizer->Remove(1);
CreatePicker();
- m_sizer->Insert(1, m_dirPicker, 0, wxALIGN_CENTER|wxALL, 5);
+ m_sizer->Insert(1, m_dirPicker, 0, wxEXPAND|wxALL, 5);
m_sizer->Layout();
}
@@ -213,6 +218,7 @@ void DirPickerWidgetsPage::Reset()
m_chkDirTextCtrl->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_USE_TEXTCTRL) != 0);
m_chkDirMustExist->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_DIR_MUST_EXIST) != 0);
m_chkDirChangeDir->SetValue((wxDIRP_DEFAULT_STYLE & wxDIRP_CHANGE_DIR) != 0);
+ m_chkSmall->SetValue((wxFLP_DEFAULT_STYLE & wxDIRP_SMALL) != 0);
}
@@ -236,7 +242,8 @@ void DirPickerWidgetsPage::OnCheckBox(wxCommandEvent &event)
{
if (event.GetEventObject() == m_chkDirTextCtrl ||
event.GetEventObject() == m_chkDirChangeDir ||
- event.GetEventObject() == m_chkDirMustExist)
+ event.GetEventObject() == m_chkDirMustExist ||
+ event.GetEventObject() == m_chkSmall)
RecreatePicker();
}
diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index 1c91ca6a6e..8e39578158 100644
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -111,7 +111,8 @@ protected:
wxCheckBox *m_chkFileTextCtrl,
*m_chkFileOverwritePrompt,
*m_chkFileMustExist,
- *m_chkFileChangeDir;
+ *m_chkFileChangeDir,
+ *m_chkSmall;
wxRadioBox *m_radioFilePickerMode;
wxBoxSizer *m_sizer;
@@ -169,6 +170,8 @@ void FilePickerWidgetsPage::CreateContent()
m_chkFileOverwritePrompt = CreateCheckBoxAndAddToSizer(filebox, wxT("Overwrite prompt"), false);
m_chkFileMustExist = CreateCheckBoxAndAddToSizer(filebox, wxT("File must exist"), false);
m_chkFileChangeDir = CreateCheckBoxAndAddToSizer(filebox, wxT("Change working dir"), false);
+ m_chkSmall = CreateCheckBoxAndAddToSizer(filebox, "&Small version", false);
+
boxleft->Add(filebox, 0, wxALL|wxGROW, 5);
boxleft->Add(new wxButton(this, PickerPage_Reset, wxT("&Reset")),
@@ -183,7 +186,7 @@ void FilePickerWidgetsPage::CreateContent()
// right pane
m_sizer = new wxBoxSizer(wxVERTICAL);
m_sizer->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
- m_sizer->Add(m_filePicker, 0, wxALIGN_CENTER|wxALL, 5);
+ m_sizer->Add(m_filePicker, 0, wxEXPAND|wxALL, 5);
m_sizer->Add(1, 1, 1, wxGROW | wxALL, 5); // spacer
// global pane
@@ -222,6 +225,9 @@ long FilePickerWidgetsPage::GetPickerStyle()
if ( m_chkFileChangeDir->GetValue() )
style |= wxFLP_CHANGE_DIR;
+ if ( m_chkSmall->GetValue() )
+ style |= wxFLP_SMALL;
+
if (m_radioFilePickerMode->GetSelection() == FilePickerMode_Open)
style |= wxFLP_OPEN;
else
@@ -234,7 +240,7 @@ void FilePickerWidgetsPage::RecreatePicker()
{
m_sizer->Remove(1);
CreatePicker();
- m_sizer->Insert(1, m_filePicker, 0, wxALIGN_CENTER||wxALL, 5);
+ m_sizer->Insert(1, m_filePicker, 0, wxEXPAND|wxALL, 5);
m_sizer->Layout();
}
@@ -247,6 +253,7 @@ void FilePickerWidgetsPage::Reset()
m_chkFileOverwritePrompt->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_OVERWRITE_PROMPT) != 0);
m_chkFileMustExist->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_FILE_MUST_EXIST) != 0);
m_chkFileChangeDir->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_CHANGE_DIR) != 0);
+ m_chkSmall->SetValue((wxFLP_DEFAULT_STYLE & wxFLP_SMALL) != 0);
UpdateFilePickerMode();
}
@@ -291,7 +298,8 @@ void FilePickerWidgetsPage::OnCheckBox(wxCommandEvent &event)
if (event.GetEventObject() == m_chkFileTextCtrl ||
event.GetEventObject() == m_chkFileOverwritePrompt ||
event.GetEventObject() == m_chkFileMustExist ||
- event.GetEventObject() == m_chkFileChangeDir)
+ event.GetEventObject() == m_chkFileChangeDir ||
+ event.GetEventObject() == m_chkSmall)
RecreatePicker();
if (event.GetEventObject() == m_radioFilePickerMode)
diff --git a/samples/widgets/widgets.cpp b/samples/widgets/widgets.cpp
index 84943cbff7..7e54947dbd 100644
--- a/samples/widgets/widgets.cpp
+++ b/samples/widgets/widgets.cpp
@@ -99,6 +99,7 @@ enum
TextEntry_DisableAutoComplete = TextEntry_Begin,
TextEntry_AutoCompleteFixed,
TextEntry_AutoCompleteFilenames,
+ TextEntry_AutoCompleteDirectories,
TextEntry_AutoCompleteCustom,
TextEntry_SetHint,
@@ -174,6 +175,7 @@ protected:
void OnDisableAutoComplete(wxCommandEvent& event);
void OnAutoCompleteFixed(wxCommandEvent& event);
void OnAutoCompleteFilenames(wxCommandEvent& event);
+ void OnAutoCompleteDirectories(wxCommandEvent& event);
void OnAutoCompleteCustom(wxCommandEvent& event);
void OnSetHint(wxCommandEvent& event);
@@ -303,6 +305,7 @@ BEGIN_EVENT_TABLE(WidgetsFrame, wxFrame)
EVT_MENU(TextEntry_DisableAutoComplete, WidgetsFrame::OnDisableAutoComplete)
EVT_MENU(TextEntry_AutoCompleteFixed, WidgetsFrame::OnAutoCompleteFixed)
EVT_MENU(TextEntry_AutoCompleteFilenames, WidgetsFrame::OnAutoCompleteFilenames)
+ EVT_MENU(TextEntry_AutoCompleteDirectories, WidgetsFrame::OnAutoCompleteDirectories)
EVT_MENU(TextEntry_AutoCompleteCustom, WidgetsFrame::OnAutoCompleteCustom)
EVT_MENU(TextEntry_SetHint, WidgetsFrame::OnSetHint)
@@ -418,6 +421,8 @@ WidgetsFrame::WidgetsFrame(const wxString& title)
wxT("Fixed-&list auto-completion"));
menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteFilenames,
wxT("&Files names auto-completion"));
+ menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteDirectories,
+ wxT("&Directories names auto-completion"));
menuTextEntry->AppendRadioItem(TextEntry_AutoCompleteCustom,
wxT("&Custom auto-completion"));
menuTextEntry->AppendSeparator();
@@ -995,6 +1000,21 @@ void WidgetsFrame::OnAutoCompleteFilenames(wxCommandEvent& WXUNUSED(event))
}
}
+void WidgetsFrame::OnAutoCompleteDirectories(wxCommandEvent& WXUNUSED(event))
+{
+ wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
+ wxCHECK_RET( entry, "menu item should be disabled" );
+
+ if ( entry->AutoCompleteDirectories() )
+ {
+ wxLogMessage("Enabled auto completion of directories.");
+ }
+ else
+ {
+ wxLogMessage("AutoCompleteDirectories() failed.");
+ }
+}
+
void WidgetsFrame::OnAutoCompleteCustom(wxCommandEvent& WXUNUSED(event))
{
wxTextEntryBase *entry = CurrentPage()->GetTextEntry();
diff --git a/samples/xrc/Makefile.in b/samples/xrc/Makefile.in
index b0f9c9e6e6..9855f6aa9b 100644
--- a/samples/xrc/Makefile.in
+++ b/samples/xrc/Makefile.in
@@ -43,7 +43,7 @@ wx_top_builddir = @wx_top_builddir@
DESTDIR =
WX_RELEASE = 2.9
-WX_VERSION = $(WX_RELEASE).2
+WX_VERSION = $(WX_RELEASE).3
LIBDIRNAME = $(wx_top_builddir)/lib
XRCDEMO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
@@ -196,7 +196,7 @@ xrcdemo$(EXEEXT): $(XRCDEMO_OBJECTS) $(__xrcdemo___win32rc)
data:
@mkdir -p ./rc
- @for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm; do \
+ @for f in artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif; do \
if test ! -f ./rc/$$f -a ! -d ./rc/$$f ; \
then x=yep ; \
else x=`find $(srcdir)/rc/$$f -newer ./rc/$$f -print` ; \
diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 640ceb508d..98b2e38818 100644
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -256,7 +256,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc
diff --git a/samples/xrc/makefile.gcc b/samples/xrc/makefile.gcc
index c0fd8fd972..8459b4b80c 100644
--- a/samples/xrc/makefile.gcc
+++ b/samples/xrc/makefile.gcc
@@ -243,7 +243,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample_rc.o
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
+ for %%f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%%f copy .\rc\%%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample_rc.o: ./../../samples/sample.rc
windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/xrc/makefile.vc b/samples/xrc/makefile.vc
index 8cf1f97d86..fde3fd3c77 100644
--- a/samples/xrc/makefile.vc
+++ b/samples/xrc/makefile.vc
@@ -366,7 +366,7 @@ $(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
data:
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc
rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_3_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc
diff --git a/samples/xrc/makefile.wat b/samples/xrc/makefile.wat
index 6baceeba05..d9ab7b2cdd 100644
--- a/samples/xrc/makefile.wat
+++ b/samples/xrc/makefile.wat
@@ -286,7 +286,7 @@ $(OBJS)\xrcdemo.exe : $(XRCDEMO_OBJECTS) $(OBJS)\xrcdemo_sample.res
data : .SYMBOLIC
if not exist $(OBJS)\rc mkdir $(OBJS)\rc
- for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
+ for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc
$(OBJS)\xrcdemo_sample.res : .AUTODEPEND .\..\..\samples\sample.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
diff --git a/samples/xrc/rc/controls.xrc b/samples/xrc/rc/controls.xrc
index b50afb8112..f0ad8ffac1 100644
--- a/samples/xrc/rc/controls.xrc
+++ b/samples/xrc/rc/controls.xrc
@@ -54,6 +54,68 @@
+
+
Appearance:
\endhtmlonly"
+ALIASES += genericAppearance{1}="\htmlonly | wxMSW appearance | wxGTK appearance | wxMac appearance |
Appearance:
\endhtmlonly"
# aliases for the creation of "named member groups"
# USAGE: the first argument must not contain spaces and be a unique identifier
diff --git a/docs/doxygen/images/generic/bannerwindow.png b/docs/doxygen/images/generic/bannerwindow.png
new file mode 100644
index 0000000000..e8a9a482ca
Binary files /dev/null and b/docs/doxygen/images/generic/bannerwindow.png differ
diff --git a/docs/doxygen/mainpages/cat_classes.h b/docs/doxygen/mainpages/cat_classes.h
index 6524ffff0c..c1a0dfacc7 100644
--- a/docs/doxygen/mainpages/cat_classes.h
+++ b/docs/doxygen/mainpages/cat_classes.h
@@ -191,6 +191,7 @@ Controls that are not static can have wxValidator associated with them.
@li wxTextCtrl: Single or multiline text editing control
@li wxToggleButton: A button which stays pressed when clicked by user.
@li wxTreeCtrl: Tree (hierarchy) control
+@li wxTreeListCtrl: Multi-column tree control with simple interface
@li wxStaticBitmap: A control to display a bitmap
@li wxStyledTextCtrl: A wxWidgets implementation of the Scintilla source code
editing component for plain text editing.
diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h
index 99d637fbf3..c7be578182 100644
--- a/docs/doxygen/mainpages/const_wxusedef.h
+++ b/docs/doxygen/mainpages/const_wxusedef.h
@@ -251,6 +251,7 @@ library:
@itemdef{wxUSE_TOOLTIPS, Use wxToolTip class.}
@itemdef{wxUSE_TREEBOOK, Use wxTreebook class.}
@itemdef{wxUSE_TREECTRL, Use wxTreeCtrl class.}
+@itemdef{wxUSE_TREELISTCTRL, Use wxTreeListCtrl class.}
@itemdef{wxUSE_TTM_WINDOWFROMPOINT, Obsolete, do not use.}
@itemdef{wxUSE_URL, Use wxURL class.}
@itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.}
diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h
index 680facc5a2..2a375ca777 100644
--- a/docs/doxygen/overviews/bitmap.h
+++ b/docs/doxygen/overviews/bitmap.h
@@ -70,7 +70,7 @@ wxBitmap bmp(wxBITMAP(bmpname));
// which is roughly equivalent to the following
#if defined(__WXMSW__) || defined(__WXPM__)
- wxBitmap bmp("bmpname", wxBITMAP_TYPE_RESOURCE);
+ wxBitmap bmp("bmpname", wxBITMAP_TYPE_BMP_RESOURCE);
#else // Unix
wxBitmap bmp(bmpname_xpm, wxBITMAP_TYPE_XPM);
#endif
diff --git a/docs/doxygen/overviews/xrc_format.h b/docs/doxygen/overviews/xrc_format.h
index 88e32f791c..72d5405f4a 100644
--- a/docs/doxygen/overviews/xrc_format.h
+++ b/docs/doxygen/overviews/xrc_format.h
@@ -526,6 +526,27 @@ controls cannot have children.
@endTable
+@subsubsection xrc_wxanimationctrl wxBannerWindow
+
+@beginTable
+@hdr3col{property, type, description}
+@row3col{direction, @c wxLEFT|wxRIGHT|wxTOP|wxBOTTOM,
+ The side along which the banner will be positioned.}
+@row3col{bitmap, @ref overview_xrcformat_type_bitmap,
+ Bitmap to use as the banner background.}
+@row3col{title, @ref overview_xrcformat_type_text,
+ Banner title, should be single line.}
+@row3col{message, @ref overview_xrcformat_type_text,
+ Possibly multi-line banner message.}
+@row3col{gradient-start, @ref overview_xrcformat_type_colour,
+ Starting colour of the gradient used as banner background. Can't be used if
+ a valid bitmap is specified.}
+@row3col{gradient-end, @ref overview_xrcformat_type_colour,
+ End colour of the gradient used as banner background. Can't be used if
+ a valid bitmap is specified.}
+@endTable
+
+
@subsubsection xrc_wxbitmapbutton wxBitmapButton
@beginTable
diff --git a/docs/doxygen/regen.bat b/docs/doxygen/regen.bat
index fa85d3b4c8..8852f69fe0 100644
--- a/docs/doxygen/regen.bat
+++ b/docs/doxygen/regen.bat
@@ -7,6 +7,7 @@ REM readable.
mkdir out 2>&1 >NUL
mkdir out\html 2>&1 >NUL
+mkdir out\html\generic 2>&1 >NUL
mkdir out\html\wxgtk 2>&1 >NUL
mkdir out\html\wxmsw 2>&1 >NUL
mkdir out\html\wxmac 2>&1 >NUL
@@ -17,6 +18,7 @@ REM custom aliases
copy images\powered-by-wxwidgets.png out\html 2>&1 >NUL
copy images\logo_*.png out\html 2>&1 >NUL
copy images\tab_*.gif out\html 2>&1 >NUL
+copy images\generic\*.png out\html\generic 2>&1 >NUL
copy images\wxgtk\*.png out\html\wxgtk 2>&1 >NUL
copy images\wxmsw\*.png out\html\wxmsw 2>&1 >NUL
copy images\wxmac\*.png out\html\wxmac 2>&1 >NUL
diff --git a/docs/doxygen/regen.sh b/docs/doxygen/regen.sh
index 8089bc1e58..40e2a68f5e 100755
--- a/docs/doxygen/regen.sh
+++ b/docs/doxygen/regen.sh
@@ -24,7 +24,7 @@ export WXWIDGETS=`cd ../.. && pwd`
# prepare folders for the cp commands below
mkdir -p out/html # we need to copy files in this folder below
-mkdir -p out/html/wxmsw out/html/wxgtk out/html/wxmac
+mkdir -p out/html/generic out/html/wxmsw out/html/wxgtk out/html/wxmac
# These are not automatically copied by Doxygen because they're not
# used in doxygen documentation, only in our html footer and by our
@@ -35,6 +35,7 @@ cp images/tab_*.gif out/html
cp images/wxmsw/*png out/html/wxmsw
cp images/wxmac/*png out/html/wxmac
cp images/wxgtk/*png out/html/wxgtk
+cp images/generic/*png out/html/generic
cp wxwidgets.js out/html
# these CSS are not automatically copied by Doxygen because they're
diff --git a/include/wx/accel.h b/include/wx/accel.h
index 6d0e2701ea..ca2d8dfb0e 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -34,10 +34,11 @@ enum wxAcceleratorEntryFlags
wxACCEL_CTRL = 0x0002, // hold Ctrl key down
wxACCEL_SHIFT = 0x0004, // hold Shift key down
#if defined(__WXMAC__) || defined(__WXCOCOA__)
- wxACCEL_CMD = 0x0008 // Command key on OS X
+ wxACCEL_RAW_CTRL= 0x0008, //
#else
- wxACCEL_CMD = wxACCEL_CTRL
+ wxACCEL_RAW_CTRL= wxACCEL_CTRL,
#endif
+ wxACCEL_CMD = wxACCEL_CTRL
};
// ----------------------------------------------------------------------------
diff --git a/include/wx/anybutton.h b/include/wx/anybutton.h
index bc5519bcfb..9b7417917b 100644
--- a/include/wx/anybutton.h
+++ b/include/wx/anybutton.h
@@ -3,7 +3,7 @@
// Purpose: wxAnyButtonBase class
// Author: Vadim Zetlin
// Created: 2000-08-15 (extracted from button.h)
-// RCS-ID: $Id: anybutton.h 65680 2010-09-30 11:44:45Z VZ $
+// RCS-ID: $Id$
// Copyright: (c) Vadim Zetlin
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -175,9 +175,9 @@ protected:
wxDECLARE_NO_COPY_CLASS(wxAnyButtonBase);
};
-//#if defined(__WXUNIVERSAL__)
-// #include "wx/univ/anybutton.h"
-#if defined(__WXMSW__)
+#if defined(__WXUNIVERSAL__)
+ #include "wx/univ/anybutton.h"
+#elif defined(__WXMSW__)
#include "wx/msw/anybutton.h"
//#elif defined(__WXMOTIF__)
// #include "wx/motif/anybutton.h"
diff --git a/include/wx/bannerwindow.h b/include/wx/bannerwindow.h
new file mode 100644
index 0000000000..eca396c5b8
--- /dev/null
+++ b/include/wx/bannerwindow.h
@@ -0,0 +1,137 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name: wx/bannerwindow.h
+// Purpose: wxBannerWindow class declaration
+// Author: Vadim Zeitlin
+// Created: 2011-08-16
+// RCS-ID: $Id$
+// Copyright: (c) 2011 Vadim Zeitlin