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 bf593b9e942118f4bfa476fadf3261719ce39acf..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"


@@ -148,13 +144,13 @@ 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.
 
 
         // Unhide method from parent.
 


@@ -166,13 +162,13 @@ public:
     // See the documentation for wxToolBar for details.
 
     virtual wxToolBarToolBase *AddTool(const int toolIndex, const wxBitmap& bitmap, const wxBitmap& pushedBitmap = wxNullBitmap,
     // 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.
 
     virtual void AddSeparator( wxWindow* pSepartorWnd );
                const wxString& helpString1 = wxT(""), const wxString& helpString2 = wxT(""));
 
         // Adds a separator. See the documentation for wxToolBar for details.
 
     virtual void AddSeparator( wxWindow* pSepartorWnd );

-FIXXXXXME
+

         // Unhide method from parent.
 
     virtual wxToolBarToolBase *AddSeparator()
         // Unhide method from parent.
 
     virtual wxToolBarToolBase *AddSeparator()


@@ -209,7 +205,7 @@ FIXXXXXME
 
         // 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.