--- Wx-0.26/Constant.xs-	2005-11-19 02:19:10 +0300

+++ Wx-0.26/Constant.xs	2006-06-26 18:29:45 +0400

@@ -2162,41 +2162,55 @@ void SetConstants()

     //

     // Predefined colours

     //

+if (wxRED)

     wxPli_set_const( "wxRED", "Wx::Colour", new wxColour( *wxRED ) );

+if (wxGREEN)

     wxPli_set_const( "wxGREEN", "Wx::Colour", new wxColour( *wxGREEN ) );

+if (wxBLUE)

     wxPli_set_const( "wxBLUE", "Wx::Colour", new wxColour( *wxBLUE ) );

+if (wxBLACK)

     wxPli_set_const( "wxBLACK", "Wx::Colour", new wxColour( *wxBLACK ) );

+if (wxWHITE)

     wxPli_set_const( "wxWHITE", "Wx::Colour", new wxColour( *wxWHITE ) );

+if (wxCYAN)

     wxPli_set_const( "wxCYAN", "Wx::Colour", new wxColour( *wxCYAN ) );

+if (wxLIGHT_GREY)

     wxPli_set_const( "wxLIGHT_GREY", "Wx::Colour",

                      new wxColour( *wxLIGHT_GREY ) );

     //

     // predefined cursors

     //

+if (wxSTANDARD_CURSOR)

     wxPli_set_const( "wxSTANDARD_CURSOR", "Wx::Cursor",

                      new wxCursor( *wxSTANDARD_CURSOR ) );

+if (wxHOURGLASS_CURSOR)

     wxPli_set_const( "wxHOURGLASS_CURSOR", "Wx::Cursor",

                      new wxCursor( *wxHOURGLASS_CURSOR ) );

+if (wxCROSS_CURSOR)

     wxPli_set_const( "wxCROSS_CURSOR", "Wx::Cursor",

                      new wxCursor( *wxCROSS_CURSOR ) );

     //

     // predefined fonts

     //

+if (wxNORMAL_FONT)

     wxPli_set_const( "wxNORMAL_FONT", "Wx::Font",

                      new wxFont( *wxNORMAL_FONT ) );

+if (wxSMALL_FONT)

     wxPli_set_const( "wxSMALL_FONT", "Wx::Font",

                      new wxFont( *wxSMALL_FONT ) );

+if (wxITALIC_FONT)

     wxPli_set_const( "wxITALIC_FONT", "Wx::Font",

                      new wxFont( *wxITALIC_FONT ) );

+if (wxSWISS_FONT)

     wxPli_set_const( "wxSWISS_FONT", "Wx::Font",

                      new wxFont( *wxSWISS_FONT ) );

     //

     // predefined pens

     //

-    #define DEFINE_PEN( pen ) \

+    #define DEFINE_PEN( pen ) if (pen) \

         wxPli_set_const( #pen, "Wx::Pen", new wxPen( *pen ) )

     DEFINE_PEN( wxRED_PEN );

@@ -2215,7 +2229,7 @@ void SetConstants()

     //

     // Predefined brushes

     //

-    #define DEFINE_BRUSH( brush ) \

+    #define DEFINE_BRUSH( brush ) if (brush) \

         wxPli_set_const( #brush, "Wx::Brush", new wxBrush( *brush ) )

     DEFINE_BRUSH( wxBLUE_BRUSH );