projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temporary fix the linking problem due to making GSocket::Detected_Read/Write() non...
[wxWidgets.git]
/
include
/
wx
/
toolbar.h
diff --git
a/include/wx/toolbar.h
b/include/wx/toolbar.h
index b7b8cc3f292fd75c5df024f5b21a33e3cc66a150..0fec2feea7ece5a00944f86847ad6942586983b8 100644
(file)
--- a/
include/wx/toolbar.h
+++ b/
include/wx/toolbar.h
@@
-22,9
+22,11
@@
enum
{
// lay out the toolbar horizontally
wxTB_HORIZONTAL = wxHORIZONTAL, // == 0x0004
{
// lay out the toolbar horizontally
wxTB_HORIZONTAL = wxHORIZONTAL, // == 0x0004
+ wxTB_TOP = wxTB_HORIZONTAL,
// lay out the toolbar vertically
wxTB_VERTICAL = wxVERTICAL, // == 0x0008
// lay out the toolbar vertically
wxTB_VERTICAL = wxVERTICAL, // == 0x0008
+ wxTB_LEFT = wxTB_VERTICAL,
// show 3D buttons (wxToolBarSimple only)
wxTB_3DBUTTONS = 0x0010,
// show 3D buttons (wxToolBarSimple only)
wxTB_3DBUTTONS = 0x0010,
@@
-52,7
+54,13
@@
enum
wxTB_HORZ_TEXT = wxTB_HORZ_LAYOUT | wxTB_TEXT,
// don't show the toolbar short help tooltips
wxTB_HORZ_TEXT = wxTB_HORZ_LAYOUT | wxTB_TEXT,
// don't show the toolbar short help tooltips
- wxTB_NO_TOOLTIPS = 0x1000
+ wxTB_NO_TOOLTIPS = 0x1000,
+
+ // lay out toolbar at the bottom of the window
+ wxTB_BOTTOM = 0x2000,
+
+ // lay out toolbar at the right edge of the window
+ wxTB_RIGHT = 0x4000
};
#if wxUSE_TOOLBAR
};
#if wxUSE_TOOLBAR
@@
-63,7
+71,7
@@
enum
#elif defined(__WXPALMOS__)
#include "wx/palmos/toolbar.h"
#elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
#elif defined(__WXPALMOS__)
#include "wx/palmos/toolbar.h"
#elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
- #include "wx/msw/t
bar95
.h"
+ #include "wx/msw/t
oolbar
.h"
#elif defined(__WXWINCE__)
#include "wx/msw/wince/tbarwce.h"
#elif defined(__WXMOTIF__)
#elif defined(__WXWINCE__)
#include "wx/msw/wince/tbarwce.h"
#elif defined(__WXMOTIF__)
@@
-73,7
+81,7
@@
enum
#elif defined(__WXGTK__)
#include "wx/gtk1/tbargtk.h"
#elif defined(__WXMAC__)
#elif defined(__WXGTK__)
#include "wx/gtk1/tbargtk.h"
#elif defined(__WXMAC__)
- #include "wx/
mac
/toolbar.h"
+ #include "wx/
osx
/toolbar.h"
#elif defined(__WXCOCOA__)
#include "wx/cocoa/toolbar.h"
#elif defined(__WXPM__)
#elif defined(__WXCOCOA__)
#include "wx/cocoa/toolbar.h"
#elif defined(__WXPM__)