%rename(EncodingConverter) wxEncodingConverter;
%rename(DC) wxDC;
%rename(MemoryDC) wxMemoryDC;
+%rename(BUFFER_VIRTUAL_AREA) wxBUFFER_VIRTUAL_AREA;
+%rename(BUFFER_CLIENT_AREA) wxBUFFER_CLIENT_AREA;
%rename(BufferedDC) wxBufferedDC;
%rename(BufferedPaintDC) wxBufferedPaintDC;
%rename(ScreenDC) wxScreenDC;
%rename(IMAGE_LIST_SMALL) wxIMAGE_LIST_SMALL;
%rename(IMAGE_LIST_STATE) wxIMAGE_LIST_STATE;
%rename(ImageList) wxImageList;
-%rename(NORMAL_FONT) wxNORMAL_FONT;
-%rename(SMALL_FONT) wxSMALL_FONT;
-%rename(ITALIC_FONT) wxITALIC_FONT;
-%rename(SWISS_FONT) wxSWISS_FONT;
-%rename(RED_PEN) wxRED_PEN;
-%rename(CYAN_PEN) wxCYAN_PEN;
-%rename(GREEN_PEN) wxGREEN_PEN;
-%rename(BLACK_PEN) wxBLACK_PEN;
-%rename(WHITE_PEN) wxWHITE_PEN;
-%rename(TRANSPARENT_PEN) wxTRANSPARENT_PEN;
-%rename(BLACK_DASHED_PEN) wxBLACK_DASHED_PEN;
-%rename(GREY_PEN) wxGREY_PEN;
-%rename(MEDIUM_GREY_PEN) wxMEDIUM_GREY_PEN;
-%rename(LIGHT_GREY_PEN) wxLIGHT_GREY_PEN;
-%rename(BLUE_BRUSH) wxBLUE_BRUSH;
-%rename(GREEN_BRUSH) wxGREEN_BRUSH;
-%rename(WHITE_BRUSH) wxWHITE_BRUSH;
-%rename(BLACK_BRUSH) wxBLACK_BRUSH;
-%rename(TRANSPARENT_BRUSH) wxTRANSPARENT_BRUSH;
-%rename(CYAN_BRUSH) wxCYAN_BRUSH;
-%rename(RED_BRUSH) wxRED_BRUSH;
-%rename(GREY_BRUSH) wxGREY_BRUSH;
-%rename(MEDIUM_GREY_BRUSH) wxMEDIUM_GREY_BRUSH;
-%rename(LIGHT_GREY_BRUSH) wxLIGHT_GREY_BRUSH;
-%rename(BLACK) wxBLACK;
-%rename(WHITE) wxWHITE;
-%rename(RED) wxRED;
-%rename(BLUE) wxBLUE;
-%rename(GREEN) wxGREEN;
-%rename(CYAN) wxCYAN;
-%rename(LIGHT_GREY) wxLIGHT_GREY;
-%rename(STANDARD_CURSOR) wxSTANDARD_CURSOR;
-%rename(HOURGLASS_CURSOR) wxHOURGLASS_CURSOR;
-%rename(CROSS_CURSOR) wxCROSS_CURSOR;
+%rename(StockGDI) wxStockGDI;
%rename(NullBitmap) wxNullBitmap;
%rename(NullIcon) wxNullIcon;
%rename(NullCursor) wxNullCursor;
%rename(NullPalette) wxNullPalette;
%rename(NullFont) wxNullFont;
%rename(NullColour) wxNullColour;
+%rename(GDIObjListBase) wxGDIObjListBase;
%rename(PenList) wxPenList;
%rename(BrushList) wxBrushList;
-%rename(ColourDatabase) wxColourDatabase;
%rename(FontList) wxFontList;
-%rename(TheFontList) wxTheFontList;
-%rename(ThePenList) wxThePenList;
-%rename(TheBrushList) wxTheBrushList;
-%rename(TheColourDatabase) wxTheColourDatabase;
+%rename(ColourDatabase) wxColourDatabase;
%rename(Effects) wxEffects;
+%rename(CONTROL_DISABLED) wxCONTROL_DISABLED;
+%rename(CONTROL_FOCUSED) wxCONTROL_FOCUSED;
+%rename(CONTROL_PRESSED) wxCONTROL_PRESSED;
+%rename(CONTROL_ISDEFAULT) wxCONTROL_ISDEFAULT;
+%rename(CONTROL_ISSUBMENU) wxCONTROL_ISSUBMENU;
+%rename(CONTROL_EXPANDED) wxCONTROL_EXPANDED;
+%rename(CONTROL_CURRENT) wxCONTROL_CURRENT;
+%rename(CONTROL_SELECTED) wxCONTROL_SELECTED;
+%rename(CONTROL_CHECKED) wxCONTROL_CHECKED;
+%rename(CONTROL_CHECKABLE) wxCONTROL_CHECKABLE;
+%rename(CONTROL_UNDETERMINED) wxCONTROL_UNDETERMINED;
+%rename(CONTROL_FLAGS_MASK) wxCONTROL_FLAGS_MASK;
+%rename(CONTROL_DIRTY) wxCONTROL_DIRTY;
+%rename(SplitterRenderParams) wxSplitterRenderParams;
+%rename(RendererVersion) wxRendererVersion;
+%rename(RendererNative) wxRendererNative;
#endif