Moved some enums around to better match the C++ headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-04-15 18:26:05 +00:00
parent 644e168383
commit 447f48ba19
4 changed files with 55 additions and 52 deletions

View File

@ -15,37 +15,12 @@
%rename(STATIC_BORDER) wxSTATIC_BORDER;
%rename(TRANSPARENT_WINDOW) wxTRANSPARENT_WINDOW;
%rename(NO_BORDER) wxNO_BORDER;
%rename(USER_COLOURS) wxUSER_COLOURS;
%rename(NO_3D) wxNO_3D;
%rename(TAB_TRAVERSAL) wxTAB_TRAVERSAL;
%rename(WANTS_CHARS) wxWANTS_CHARS;
%rename(POPUP_WINDOW) wxPOPUP_WINDOW;
%rename(CENTER_FRAME) wxCENTER_FRAME;
%rename(CENTRE_ON_SCREEN) wxCENTRE_ON_SCREEN;
%rename(CENTER_ON_SCREEN) wxCENTER_ON_SCREEN;
%rename(STAY_ON_TOP) wxSTAY_ON_TOP;
%rename(ICONIZE) wxICONIZE;
%rename(MINIMIZE) wxMINIMIZE;
%rename(MAXIMIZE) wxMAXIMIZE;
%rename(CLOSE_BOX) wxCLOSE_BOX;
%rename(THICK_FRAME) wxTHICK_FRAME;
%rename(SYSTEM_MENU) wxSYSTEM_MENU;
%rename(MINIMIZE_BOX) wxMINIMIZE_BOX;
%rename(MAXIMIZE_BOX) wxMAXIMIZE_BOX;
%rename(TINY_CAPTION_HORIZ) wxTINY_CAPTION_HORIZ;
%rename(TINY_CAPTION_VERT) wxTINY_CAPTION_VERT;
%rename(RESIZE_BOX) wxRESIZE_BOX;
%rename(RESIZE_BORDER) wxRESIZE_BORDER;
%rename(DIALOG_MODAL) wxDIALOG_MODAL;
%rename(DIALOG_MODELESS) wxDIALOG_MODELESS;
%rename(DIALOG_NO_PARENT) wxDIALOG_NO_PARENT;
%rename(DEFAULT_FRAME_STYLE) wxDEFAULT_FRAME_STYLE;
%rename(DEFAULT_DIALOG_STYLE) wxDEFAULT_DIALOG_STYLE;
%rename(FRAME_TOOL_WINDOW) wxFRAME_TOOL_WINDOW;
%rename(FRAME_FLOAT_ON_PARENT) wxFRAME_FLOAT_ON_PARENT;
%rename(FRAME_NO_WINDOW_MENU) wxFRAME_NO_WINDOW_MENU;
%rename(FRAME_NO_TASKBAR) wxFRAME_NO_TASKBAR;
%rename(FRAME_SHAPED) wxFRAME_SHAPED;
%rename(ED_CLIENT_MARGIN) wxED_CLIENT_MARGIN;
%rename(ED_BUTTONS_BOTTOM) wxED_BUTTONS_BOTTOM;
%rename(ED_BUTTONS_RIGHT) wxED_BUTTONS_RIGHT;

View File

@ -268,8 +268,6 @@ enum {
wxSTATIC_BORDER,
wxTRANSPARENT_WINDOW,
wxNO_BORDER,
wxUSER_COLOURS,
wxNO_3D,
wxTAB_TRAVERSAL,
wxWANTS_CHARS,
@ -278,31 +276,6 @@ enum {
wxCENTRE_ON_SCREEN,
wxCENTER_ON_SCREEN,
wxSTAY_ON_TOP,
wxICONIZE,
wxMINIMIZE,
wxMAXIMIZE,
wxCLOSE_BOX,
wxTHICK_FRAME,
wxSYSTEM_MENU,
wxMINIMIZE_BOX,
wxMAXIMIZE_BOX,
wxTINY_CAPTION_HORIZ,
wxTINY_CAPTION_VERT,
wxRESIZE_BOX,
wxRESIZE_BORDER,
wxDIALOG_MODAL,
wxDIALOG_MODELESS,
wxDIALOG_NO_PARENT,
wxDEFAULT_FRAME_STYLE,
wxDEFAULT_DIALOG_STYLE,
wxFRAME_TOOL_WINDOW,
wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU,
wxFRAME_NO_TASKBAR,
wxFRAME_SHAPED,
wxED_CLIENT_MARGIN,
wxED_BUTTONS_BOTTOM,
wxED_BUTTONS_RIGHT,

View File

@ -23,6 +23,40 @@ MAKE_CONST_WXSTRING(ToolBarNameStr);
//---------------------------------------------------------------------------
%newgroup
enum
{
wxSTAY_ON_TOP,
wxICONIZE,
wxMINIMIZE,
wxMAXIMIZE,
wxCLOSE_BOX,
wxTHICK_FRAME,
wxSYSTEM_MENU,
wxMINIMIZE_BOX,
wxMAXIMIZE_BOX,
wxTINY_CAPTION_HORIZ,
wxTINY_CAPTION_VERT,
wxRESIZE_BOX,
wxRESIZE_BORDER,
wxDIALOG_NO_PARENT,
wxDEFAULT_FRAME_STYLE,
wxDEFAULT_DIALOG_STYLE,
wxFRAME_TOOL_WINDOW,
wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU,
wxFRAME_NO_TASKBAR,
wxFRAME_SHAPED,
// Obsolete
//wxDIALOG_MODAL,
//wxDIALOG_MODELESS,
//wxUSER_COLOURS,
//wxNO_3D,
};
enum
{
wxFULLSCREEN_NOMENUBAR,

View File

@ -5,6 +5,27 @@
%rename(Panel) wxPanel;
%rename(ScrolledWindow) wxScrolledWindow;
%rename(STAY_ON_TOP) wxSTAY_ON_TOP;
%rename(ICONIZE) wxICONIZE;
%rename(MINIMIZE) wxMINIMIZE;
%rename(MAXIMIZE) wxMAXIMIZE;
%rename(CLOSE_BOX) wxCLOSE_BOX;
%rename(THICK_FRAME) wxTHICK_FRAME;
%rename(SYSTEM_MENU) wxSYSTEM_MENU;
%rename(MINIMIZE_BOX) wxMINIMIZE_BOX;
%rename(MAXIMIZE_BOX) wxMAXIMIZE_BOX;
%rename(TINY_CAPTION_HORIZ) wxTINY_CAPTION_HORIZ;
%rename(TINY_CAPTION_VERT) wxTINY_CAPTION_VERT;
%rename(RESIZE_BOX) wxRESIZE_BOX;
%rename(RESIZE_BORDER) wxRESIZE_BORDER;
%rename(DIALOG_NO_PARENT) wxDIALOG_NO_PARENT;
%rename(DEFAULT_FRAME_STYLE) wxDEFAULT_FRAME_STYLE;
%rename(DEFAULT_DIALOG_STYLE) wxDEFAULT_DIALOG_STYLE;
%rename(FRAME_TOOL_WINDOW) wxFRAME_TOOL_WINDOW;
%rename(FRAME_FLOAT_ON_PARENT) wxFRAME_FLOAT_ON_PARENT;
%rename(FRAME_NO_WINDOW_MENU) wxFRAME_NO_WINDOW_MENU;
%rename(FRAME_NO_TASKBAR) wxFRAME_NO_TASKBAR;
%rename(FRAME_SHAPED) wxFRAME_SHAPED;
%rename(FULLSCREEN_NOMENUBAR) wxFULLSCREEN_NOMENUBAR;
%rename(FULLSCREEN_NOTOOLBAR) wxFULLSCREEN_NOTOOLBAR;
%rename(FULLSCREEN_NOSTATUSBAR) wxFULLSCREEN_NOSTATUSBAR;