From 715c1da4a738567ac5ca05b369bb857ef6fb4b8c Mon Sep 17 00:00:00 2001 From: David Elliott Date: Tue, 16 Dec 2003 15:44:11 +0000 Subject: [PATCH] wxCocoa: New native wxToolBar git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build/bakefiles/files.bkl | 2 ++ configure.in | 1 - include/wx/toolbar.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl index 810f1ffc85..2d0c73cf71 100644 --- a/build/bakefiles/files.bkl +++ b/build/bakefiles/files.bkl @@ -1754,6 +1754,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! src/cocoa/statline2.mm src/cocoa/stattext.mm src/cocoa/textctrl.mm + src/cocoa/toolbar.mm src/cocoa/toplevel.mm src/cocoa/utils.cpp src/cocoa/utilsexc.cpp @@ -1828,6 +1829,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file! wx/cocoa/statline.h wx/cocoa/stattext.h wx/cocoa/textctrl.h + wx/cocoa/toolbar.h wx/cocoa/toplevel.h wx/cocoa/window.h diff --git a/configure.in b/configure.in index c0bd57f613..83e0084cc3 100644 --- a/configure.in +++ b/configure.in @@ -1025,7 +1025,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_DRAG_AND_DROP=no # Generic notebook requires tab dialog DEFAULT_wxUSE_TABDIALOG=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=no DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAGIMAGE=no diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h index 4e1a581f47..61abe5d7f6 100644 --- a/include/wx/toolbar.h +++ b/include/wx/toolbar.h @@ -135,6 +135,8 @@ enum #include "wx/gtk/tbargtk.h" #elif defined(__WXMAC__) #include "wx/mac/toolbar.h" + #elif defined(__WXCOCOA__) + #include "wx/cocoa/toolbar.h" #elif defined(__WXPM__) #include "wx/os2/toolbar.h" #endif -- 2.47.2