This commit was manufactured by cvs2svn to create tag 'WX_2_2_5'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_2_5@9282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

debian/changelog

@@ -1,7 +1,5 @@
-wxwindows2.2 (2.2.5.1) unstable; urgency=low
+wxwindows2.2 (2.2.5) unstable; urgency=low
 
-  * "This One's for Dirk"  Closes: #84696
-  * 2.2.5 has known issues and will not be released for Debian.
   * Fixed parser.y for Alpha builds (#82949)
   * changed mesa dependency to the virtual libgl package and
     added Conflicts for the old 2.1 packages (which are now

debian/control.in

@@ -1,7 +1,7 @@
 Source: wxwindows=V
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>=2.0), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
+Build-Depends: debhelper (>=1.1.17), flex, bison, libgtk1.2-dev, python-dev (>=1.5.2), python-distutils, zlib1g-dev, libjpeg62-dev, libpng2-dev, libtiff3g-dev, libgl-dev, libesd0-dev
 Maintainer: Ron Lee <ron@debian.org>
 Standards-Version: 3.2.1.2
 

debian/rules

@@ -430,7 +430,7 @@ install-examples: build-examples-stamp
 	dh_installdirs
 
 binary-common:
-	dh_testversion 2
+	dh_testversion 1.1.17
 	dh_testdir
 	dh_testroot
 	dh_installdocs

docs/changes.txt

@@ -13,14 +13,6 @@ wxMSW:
 OTHER CHANGES
 -------------
 
-2.2.6
------
-
-wxMSW:
-
-- wxChoice sizing bug introduced in 2.2.5 fixed (oops) and calculating of
-  the size of initially empty wxChoice controls fixed as well
-
 2.2.5
 -----
 

docs/gtk/changes.txt

@@ -2,11 +2,7 @@ This file contains the detailed log of wxGTK-specific changes, please see
 doc/changes.txt for the concise log of important changes in all wxWindows
 ports.
 
-*** next release ***
 
-wxWakeUpIdle() works again
-
-wxGauge now supports wxGA_VERTICAL (Shane Forsythe)
 
 *** 29th January 2001: wxWindows 2.2.5 released ***
 

samples/font/font.cpp

@@ -384,15 +384,15 @@ void MyFrame::OnEnumerateFamiliesForEncoding(wxCommandEvent& WXUNUSED(event))
 
     static const char *encodingNames[] =
     {
-        "Western European (ISO-8859-1)",
+        "West European (Latin 1)",
-        "Central European (ISO-8859-2)",
+        "Central European (Latin 2)",
-        "Cyrillic (ISO-8859-5)",
+        "Cyrillic (Latin 5)",
-        "Greek (ISO-8859-7)",
+        "Greek (Latin 7)",
-        "Western European with Euro (ISO-8859-15)",
+        "West European new (Latin 0)",
         "KOI8-R",
-        "Windows Central European (CP 1250)",
+        "Windows Latin 2",
-        "Windows Cyrillic (CP 1251)",
+        "Windows Cyrillic",
-        "Windows Western European (CP 1252)",
+        "Windows Latin 1",
     };
 
     int n = wxGetSingleChoiceIndex("Choose an encoding", "Font demo",

src/common/encconv.cpp

@@ -301,7 +301,7 @@ static wxFontEncoding
 
     // *** Please put more common encodings as first! ***
 
-    // Western European
+    // West European
     {
         /* unix    */ {wxFONTENCODING_ISO8859_1, wxFONTENCODING_ISO8859_15, STOP},
         /* windows */ {wxFONTENCODING_CP1252, STOP},
@@ -319,7 +319,7 @@ static wxFontEncoding
     
     // Baltic
     {
-        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4, STOP},
+        /* unix    */ {wxFONTENCODING_ISO8859_13, STOP},
         /* windows */ {wxFONTENCODING_CP1257, STOP},
         /* os2     */ {STOP},
         /* mac     */ {STOP}   
@@ -358,6 +358,15 @@ static wxFontEncoding
     },
 
     // Cyrillic
+    {
+        /* unix    */ {wxFONTENCODING_ISO8859_13, wxFONTENCODING_ISO8859_4,
+                       wxFONTENCODING_ISO8859_15, wxFONTENCODING_ISO8859_1, STOP},
+        /* windows */ {wxFONTENCODING_CP1257, wxFONTENCODING_CP1252, STOP},
+        /* os2     */ {STOP},
+        /* mac     */ {STOP}   
+    },
+
+    // Russia and other KOI-8 users:
     {
         /* unix    */ {wxFONTENCODING_KOI8, wxFONTENCODING_ISO8859_5, STOP},
         /* windows */ {wxFONTENCODING_CP1251, STOP},

src/common/fontmap.cpp

@@ -94,11 +94,11 @@ static wxFontEncoding gs_encodings[] =
 // the descriptions for them
 static const wxChar* gs_encodingDescs[] =
 {
-    wxTRANSLATE( "Western European (ISO-8859-1)" ),
+    wxTRANSLATE( "Western European (ISO-8859-1/Latin 1)" ),
-    wxTRANSLATE( "Central European (ISO-8859-2)" ),
+    wxTRANSLATE( "Central European (ISO-8859-2/Latin 2)" ),
     wxTRANSLATE( "Esperanto (ISO-8859-3)" ),
     wxTRANSLATE( "Baltic (old) (ISO-8859-4)" ),
-    wxTRANSLATE( "Cyrillic (ISO-8859-5)" ),
+    wxTRANSLATE( "Cyrillic (Latin 5)" ),
     wxTRANSLATE( "Arabic (ISO-8859-6)" ),
     wxTRANSLATE( "Greek (ISO-8859-7)" ),
     wxTRANSLATE( "Hebrew (ISO-8859-8)" ),
@@ -108,7 +108,7 @@ static const wxChar* gs_encodingDescs[] =
     wxTRANSLATE( "Indian (ISO-8859-12)" ),
     wxTRANSLATE( "Baltic (ISO-8859-13)" ),
     wxTRANSLATE( "Celtic (ISO-8859-14)" ),
-    wxTRANSLATE( "Western European with Euro (ISO-8859-15)" ),
+    wxTRANSLATE( "Western European with Euro (ISO-8859-15/Latin 0)" ),
     wxTRANSLATE( "KOI8-R" ),
     wxTRANSLATE( "Windows Central European (CP 1250)" ),
     wxTRANSLATE( "Windows Cyrillic (CP 1251)" ),

src/generic/grid.cpp

@@ -1387,12 +1387,12 @@ void wxGridCellEditorEvtHandler::OnKeyDown(wxKeyEvent& event)
             break;
 
         case WXK_TAB:
-            event.Skip( m_grid->GetEventHandler()->ProcessEvent( event ) );
+            event.Skip( m_grid->ProcessEvent( event ) );
             break;
 
         case WXK_RETURN:
         case WXK_NUMPAD_ENTER:
-            if (!m_grid->GetEventHandler()->ProcessEvent(event))
+            if (!m_grid->ProcessEvent(event))
                 m_editor->HandleReturn(event);
             break;
 
@@ -3117,12 +3117,12 @@ void wxGridRowLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridRowLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridRowLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3176,12 +3176,12 @@ void wxGridColLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridColLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridColLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3234,12 +3234,12 @@ void wxGridCornerLabelWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridCornerLabelWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridCornerLabelWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 
@@ -3308,12 +3308,12 @@ void wxGridWindow::OnMouseEvent( wxMouseEvent& event )
 //
 void wxGridWindow::OnKeyDown( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnKeyUp( wxKeyEvent& event )
 {
-    if ( !m_owner->GetEventHandler()->ProcessEvent( event ) ) event.Skip();
+    if ( !m_owner->ProcessEvent( event ) ) event.Skip();
 }
 
 void wxGridWindow::OnEraseBackground( wxEraseEvent& WXUNUSED(event) )

src/gtk/app.cpp

@@ -182,6 +182,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves
     gdk_threads_enter();
 
+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+
     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only
@@ -190,9 +193,6 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
-
     // Release lock again
     gdk_threads_leave();
 

src/gtk/gauge.cpp

@@ -42,8 +42,6 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     m_useProgressBar = TRUE;
   
     m_widget = gtk_progress_bar_new();
-    if( style & wxGA_VERTICAL)
-        gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
   
     m_parent->DoAddChild( this );
   

src/gtk1/app.cpp

@@ -182,6 +182,9 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // thread so we must lock it here ourselves
     gdk_threads_enter();
 
+    // Sent idle event to all who request them
+    while (wxTheApp->ProcessIdle()) { }
+
     /* Indicate that we are now in idle mode - even so deeply
        in idle mode that we don't get any idle events anymore.
        this is like wxMSW where an idle event is sent only
@@ -190,9 +193,6 @@ gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     g_isIdle = TRUE;
     wxTheApp->m_idleTag = 0;
 
-    // Sent idle event to all who request them
-    while (wxTheApp->ProcessIdle()) { }
-
     // Release lock again
     gdk_threads_leave();
 

src/gtk1/gauge.cpp

@@ -42,8 +42,6 @@ bool wxGauge::Create( wxWindow *parent, wxWindowID id,  int range,
     m_useProgressBar = TRUE;
   
     m_widget = gtk_progress_bar_new();
-    if( style & wxGA_VERTICAL)
-        gtk_progress_bar_set_orientation( GTK_PROGRESS_BAR(m_widget) , GTK_PROGRESS_BOTTOM_TO_TOP );
   
     m_parent->DoAddChild( this );
   

src/msw/choice.cpp

@@ -106,20 +106,6 @@ int wxChoice::DoAppend(const wxString& item)
         wxLogLastError(wxT("SendMessage(CB_ADDSTRING)"));
     }
 
-    // if we were created empty, the choice is too small to show any items, so
-    // resize it - but as we do it once only, give it some reasonable size
-    if ( GetCount() == 1 )
-    {
-        wxSize size = GetSize();
-        int cx, cy;
-        wxGetCharSize(GetHWND(), &cx, &cy, &GetFont());
-
-        size.y = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-
-        // don't call our SetSize() as it ignores the height parameter
-        wxControl::DoSetSize(-1, -1, size.x, size.y, wxSIZE_USE_EXISTING);
-    }
-
     return n;
 }
 
@@ -301,13 +287,7 @@ wxSize wxChoice::DoGetBestSize() const
 
     wChoice += 5*cx;
 
-    if ( nItems > 10 )
+    int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
-    {
-        // don't make the control too big
-        nItems = 10;
-    }
-
-    int hChoice = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)*(nItems + 1);
 
     return wxSize(wChoice, hChoice);
 }

src/msw/dc.cpp

@@ -1115,7 +1115,6 @@ void wxDC::SetBackgroundMode(int mode)
         ::SetBkMode(GetHdc(), TRANSPARENT);
     else
         ::SetBkMode(GetHdc(), OPAQUE);
-	Last change:  AC   29 Jan 101    8:54 pm
 */
 }
 
@@ -1441,7 +1440,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
         // of the mask which is also contrary to the Windows one)
         success = ::MaskBlt(GetHdc(), xdest, ydest, width, height,
                             GetHdcOf(*source), xsrc, ysrc,
-                            (HBITMAP)mask->GetMaskBitmap(), xsrc, ysrc,
+                            (HBITMAP)mask->GetMaskBitmap(), 0, 0,
                             MAKEROP4(dwRop, DSTCOPY)) != 0;
 
         if ( !success )

wxPython/contrib/glcanvas/stub.cpp

@@ -0,0 +1,24 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initglcanvasc() {
+}
+
+

wxPython/contrib/ogl/stub.cpp

@@ -0,0 +1,24 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initoglc() {
+}
+
+

wxPython/contrib/stc/stub.cpp

@@ -0,0 +1,23 @@
+/* Definitions for Windows/Unix exporting */
+#if defined(__WIN32__)
+#   if defined(_MSC_VER)
+#	define SWIGEXPORT(a) __declspec(dllexport) a
+#   else
+#	if defined(__BORLANDC__)
+#	    define SWIGEXPORT(a) a _export
+#	else
+#	    define SWIGEXPORT(a) a
+#	endif
+#   endif
+#else
+#   define SWIGEXPORT(a) a
+#endif
+
+
+#ifdef __cplusplus
+extern "C"
+#endif
+SWIGEXPORT(void) initstc_c() {
+}
+
+

wxPython/setup.py

@@ -249,7 +249,7 @@ if not GL_ONLY:
                     extra_compile_args = cflags,
                     extra_link_args = lflags,
                     )
-    wxpExtensions.append(ext)
+        wxpExtensions.append(ext)
 
 
     # Extension for the grid module