Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -298,6 +298,7 @@ enum {
|
||||
wxRA_SPECIFY_ROWS,
|
||||
wxRA_SPECIFY_COLS,
|
||||
wxRB_GROUP,
|
||||
wxRB_SINGLE,
|
||||
wxGA_PROGRESSBAR,
|
||||
wxGA_HORIZONTAL,
|
||||
wxGA_VERTICAL,
|
||||
@@ -532,6 +533,17 @@ enum {
|
||||
wxMOUSE_BTN_MIDDLE,
|
||||
wxMOUSE_BTN_RIGHT,
|
||||
|
||||
// It looks like wxTabCtrl may rise from the dead. Uncomment these if
|
||||
// it gets an implementation for all platforms...
|
||||
// wxTC_RIGHTJUSTIFY,
|
||||
// wxTC_FIXEDWIDTH,
|
||||
// wxTC_TOP,
|
||||
// wxTC_LEFT,
|
||||
// wxTC_RIGHT,
|
||||
// wxTC_BOTTOM,
|
||||
// wxTC_MULTILINE,
|
||||
// wxTC_OWNERDRAW,
|
||||
|
||||
};
|
||||
|
||||
|
||||
@@ -921,12 +933,6 @@ enum wxHitTest
|
||||
|
||||
|
||||
|
||||
#define FALSE 0
|
||||
#define false 0
|
||||
#define TRUE 1
|
||||
#define true 1
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
|
Reference in New Issue
Block a user