don't draw focus rect for custom drawn items when the list control doesn't have focus

[wxWidgets.git] / contrib / include / wx / fl / dyntbar.h

diff --git a/contrib/include/wx/fl/dyntbar.h b/contrib/include/wx/fl/dyntbar.h
index 32dcffa4bf365c542be4dfd07e7df200a5cbe050..5db0c21d857de86f9db6ccc26152e1b82d6008d9 100644 (file)
--- a/contrib/include/wx/fl/dyntbar.h
+++ b/contrib/include/wx/fl/dyntbar.h
@@ -12,10 +12,6 @@
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__
 
 #ifndef __DYNTBAR_G__
 #define __DYNTBAR_G__
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "dyntbar.h"
-#endif
-

 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"
 #include "wx/tbarbase.h"
 #include "wx/dynarray.h"
 #include "wx/fl/fldefs.h"


@@ -24,7 +20,7 @@
 Tool layout item.
 */
 
 Tool layout item.
 */
 

-class WXFL_DECLSPEC wxToolLayoutItem : public wxObject
+class WXDLLIMPEXP_FL wxToolLayoutItem : public wxObject

 {
     DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
 
 {
     DECLARE_DYNAMIC_CLASS(wxToolLayoutItem)
 


@@ -33,19 +29,19 @@ public:
     bool      mIsSeparator;
 };
 
     bool      mIsSeparator;
 };
 

-class WXFL_DECLSPEC wxDynToolInfo;
+class WXDLLIMPEXP_FL wxDynToolInfo;

 
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
 
 
 typedef wxToolLayoutItem* wxToolLayoutItemPtrT;
 typedef wxDynToolInfo*    wxDynToolInfoPtrT;
 

-WXFL_DEFINE_ARRAY( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
-WXFL_DEFINE_ARRAY( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );
+WXFL_DEFINE_ARRAY_PTR( wxToolLayoutItemPtrT, wxLayoutItemArrayT  );
+WXFL_DEFINE_ARRAY_PTR( wxDynToolInfoPtrT,    wxDynToolInfoArrayT );

 
 /*
 This is a base class for layout algorithm implementations.
 */
 
 
 /*
 This is a base class for layout algorithm implementations.
 */
 

-class WXFL_DECLSPEC LayoutManagerBase
+class WXDLLIMPEXP_FL LayoutManagerBase

 {
 public:
         // Constructor.
 {
 public:
         // Constructor.


@@ -64,7 +60,7 @@ BagLayout lays out items in left-to-right order from
 top to bottom.
 */
 
 top to bottom.
 */
 

-class WXFL_DECLSPEC BagLayout : public LayoutManagerBase
+class WXDLLIMPEXP_FL BagLayout : public LayoutManagerBase

 {
 public:
         // Constructor.
 {
 public:
         // Constructor.


@@ -79,7 +75,7 @@ public:
 This class holds dynamic toolbar item information.
 */
 
 This class holds dynamic toolbar item information.
 */
 

-class WXFL_DECLSPEC wxDynToolInfo : public wxToolLayoutItem
+class WXDLLIMPEXP_FL wxDynToolInfo : public wxToolLayoutItem

 {
     DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
 
 {
     DECLARE_DYNAMIC_CLASS(wxDynToolInfo)
 


@@ -99,7 +95,7 @@ public:
 wxDynamicToolBar manages containment and layout of tool windows.
 */
 
 wxDynamicToolBar manages containment and layout of tool windows.
 */
 

-class WXFL_DECLSPEC wxDynamicToolBar : public wxToolBarBase
+class WXDLLIMPEXP_FL wxDynamicToolBar : public wxToolBarBase

 {
 protected:
     friend class wxDynamicToolBarSerializer;
 {
 protected:
     friend class wxDynamicToolBarSerializer;


@@ -148,25 +144,35 @@ public:
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,
     virtual void AddTool( int toolIndex,
                               const wxString& imageFileName,
                               wxBitmapType imageFileType = wxBITMAP_TYPE_BMP,

-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
-                              bool isFlat = TRUE );
+                              const wxString& labelText = wxT(""), bool alignTextRight = false,
+                              bool isFlat = true );

         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,
         // Adds a tool. See the documentation for wxToolBar for details.
 
     virtual void AddTool( int toolIndex, wxBitmap labelBmp,

-                              const wxString& labelText = wxT(""), bool alignTextRight = FALSE,
-                              bool isFlat = TRUE );
+                              const wxString& labelText = wxT(""), bool alignTextRight = false,
+                              bool isFlat = true );
+
+        // Unhide method from parent.
+
+    virtual wxToolBarToolBase *AddTool (wxToolBarToolBase *tool)
+                              { return wxToolBarBase::AddTool(tool); };

 
     // Method from wxToolBarBase (for compatibility), only
     // the first two arguments are valid.
     // See the documentation for wxToolBar for details.
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
 
     // Method from wxToolBarBase (for compatibility), only
     // the first two arguments are valid.
     // See the documentation for wxToolBar for details.
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,

-               const bool toggle = FALSE, const long xPos = -1, const long yPos = -1, wxObject *clientData = NULL,
+               const bool toggle = false, const long xPos = wxDefaultCoord, const long yPos = wxDefaultCoord, wxObject *clientData = NULL,

                const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.
 
                const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.
 

-    virtual void AddSeparator( wxWindow* pSepartorWnd = NULL );
+    virtual void AddSeparator( wxWindow* pSepartorWnd );
+
+        // Unhide method from parent.
+
+    virtual wxToolBarToolBase *AddSeparator()
+                              { return wxToolBarBase::AddSeparator(); };

 
         // Returns tool information for the given tool index.
 
 
         // Returns tool information for the given tool index.
 


@@ -199,7 +205,7 @@ public:
 
         // Enables or disables the given tool.
 
 
         // Enables or disables the given tool.
 

-    virtual void EnableTool(int toolIndex, bool enable = TRUE);
+    virtual void EnableTool(int toolIndex, bool enable = true);

 
         // Responds to size events, calling Layout.
 
 
         // Responds to size events, calling Layout.