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


@@ -166,7 +162,7 @@ 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 = wxDefaultPosition.x, const long yPos = wxDefaultPosition.y, 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.