From 6cffbf02c02c6df717dab7635c4b2031ed4d3414 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Mon, 19 Apr 2004 23:22:38 +0000
Subject: [PATCH] Add back some missing enums

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wxPython/src/_core_rename.i    | 1 +
 wxPython/src/_defs.i           | 2 ++
 wxPython/src/_toplvl.i         | 8 ++++----
 wxPython/src/_windows_rename.i | 4 ++++
 wxPython/wxPython/core.py      | 1 +
 wxPython/wxPython/windows.py   | 4 ++++
 6 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/wxPython/src/_core_rename.i b/wxPython/src/_core_rename.i
index 67528579ab..f2a4a37716 100644
--- a/wxPython/src/_core_rename.i
+++ b/wxPython/src/_core_rename.i
@@ -28,6 +28,7 @@
 %rename(EXT_DIALOG_STYLE)                   wxEXT_DIALOG_STYLE;
 %rename(CLIP_CHILDREN)                      wxCLIP_CHILDREN;
 %rename(CLIP_SIBLINGS)                      wxCLIP_SIBLINGS;
+%rename(ALWAYS_SHOW_SB)                     wxALWAYS_SHOW_SB;
 %rename(RETAINED)                           wxRETAINED;
 %rename(BACKINGSTORE)                       wxBACKINGSTORE;
 %rename(COLOURED)                           wxCOLOURED;
diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index a423b8945f..c887d74f81 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -285,6 +285,8 @@ enum {
     wxCLIP_CHILDREN,
     wxCLIP_SIBLINGS,
 
+    wxALWAYS_SHOW_SB,
+    
     wxRETAINED,
     wxBACKINGSTORE,
 
diff --git a/wxPython/src/_toplvl.i b/wxPython/src/_toplvl.i
index 52bfd7bf62..5997304fed 100644
--- a/wxPython/src/_toplvl.i
+++ b/wxPython/src/_toplvl.i
@@ -51,10 +51,10 @@ enum
     wxFRAME_SHAPED,
 
     // Obsolete
-    //wxDIALOG_MODAL,
-    //wxDIALOG_MODELESS,
-    //wxUSER_COLOURS,
-    //wxNO_3D,
+    wxDIALOG_MODAL,
+    wxDIALOG_MODELESS,
+    wxUSER_COLOURS,
+    wxNO_3D,
 };    
 
 enum
diff --git a/wxPython/src/_windows_rename.i b/wxPython/src/_windows_rename.i
index 884f07bbcc..739fafc71a 100644
--- a/wxPython/src/_windows_rename.i
+++ b/wxPython/src/_windows_rename.i
@@ -26,6 +26,10 @@
 %rename(FRAME_NO_WINDOW_MENU)               wxFRAME_NO_WINDOW_MENU;
 %rename(FRAME_NO_TASKBAR)                   wxFRAME_NO_TASKBAR;
 %rename(FRAME_SHAPED)                       wxFRAME_SHAPED;
+%rename(DIALOG_MODAL)                       wxDIALOG_MODAL;
+%rename(DIALOG_MODELESS)                    wxDIALOG_MODELESS;
+%rename(USER_COLOURS)                       wxUSER_COLOURS;
+%rename(NO_3D)                              wxNO_3D;
 %rename(FULLSCREEN_NOMENUBAR)               wxFULLSCREEN_NOMENUBAR;
 %rename(FULLSCREEN_NOTOOLBAR)               wxFULLSCREEN_NOTOOLBAR;
 %rename(FULLSCREEN_NOSTATUSBAR)             wxFULLSCREEN_NOSTATUSBAR;
diff --git a/wxPython/wxPython/core.py b/wxPython/wxPython/core.py
index c824c2a85b..7148cb9d94 100644
--- a/wxPython/wxPython/core.py
+++ b/wxPython/wxPython/core.py
@@ -44,6 +44,7 @@ wxED_STATIC_LINE = wx.core.ED_STATIC_LINE
 wxEXT_DIALOG_STYLE = wx.core.EXT_DIALOG_STYLE
 wxCLIP_CHILDREN = wx.core.CLIP_CHILDREN
 wxCLIP_SIBLINGS = wx.core.CLIP_SIBLINGS
+wxALWAYS_SHOW_SB = wx.core.ALWAYS_SHOW_SB
 wxRETAINED = wx.core.RETAINED
 wxBACKINGSTORE = wx.core.BACKINGSTORE
 wxCOLOURED = wx.core.COLOURED
diff --git a/wxPython/wxPython/windows.py b/wxPython/wxPython/windows.py
index cd804b31d3..e7d99eefad 100644
--- a/wxPython/wxPython/windows.py
+++ b/wxPython/wxPython/windows.py
@@ -50,6 +50,10 @@ wxFRAME_FLOAT_ON_PARENT = wx.windows.FRAME_FLOAT_ON_PARENT
 wxFRAME_NO_WINDOW_MENU = wx.windows.FRAME_NO_WINDOW_MENU
 wxFRAME_NO_TASKBAR = wx.windows.FRAME_NO_TASKBAR
 wxFRAME_SHAPED = wx.windows.FRAME_SHAPED
+wxDIALOG_MODAL = wx.windows.DIALOG_MODAL
+wxDIALOG_MODELESS = wx.windows.DIALOG_MODELESS
+wxUSER_COLOURS = wx.windows.USER_COLOURS
+wxNO_3D = wx.windows.NO_3D
 wxFULLSCREEN_NOMENUBAR = wx.windows.FULLSCREEN_NOMENUBAR
 wxFULLSCREEN_NOTOOLBAR = wx.windows.FULLSCREEN_NOTOOLBAR
 wxFULLSCREEN_NOSTATUSBAR = wx.windows.FULLSCREEN_NOSTATUSBAR
-- 
2.45.2