patch from Dimitri fixing crashes when decoding the invalid GIFs

[wxWidgets.git] / src / generic / choicdgg.cpp

diff --git a/src/generic/choicdgg.cpp b/src/generic/choicdgg.cpp
index f97e674d19d0181b9a4457e7e6ae46d2cf42d414..50e29af9102372f28f8c36261ff07e3cbc371e24 100644 (file)
--- a/src/generic/choicdgg.cpp
+++ b/src/generic/choicdgg.cpp
@@ -86,7 +86,7 @@ int ConvertWXArrayToC(const wxArrayString& aChoices, wxString **choices)
 
     for ( int i = 0; i < n; i++ )
     {
 
     for ( int i = 0; i < n; i++ )
     {

-        (*choices)[i] = aChoices[i];   
+        (*choices)[i] = aChoices[i];

     }
 
     return n;
     }
 
     return n;


@@ -129,7 +129,7 @@ wxString wxGetSingleChoice( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,
 // Overloaded for backward compatibility
 wxString wxGetSingleChoice( const wxString& message,
                             const wxString& caption,


@@ -186,7 +186,7 @@ int wxGetSingleChoiceIndex( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,
 // Overloaded for backward compatibility
 int wxGetSingleChoiceIndex( const wxString& message,
                             const wxString& caption,


@@ -244,7 +244,7 @@ void *wxGetSingleChoiceData( const wxString& message,
     return res;
 }
 
     return res;
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 // Overloaded for backward compatibility
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,
 // Overloaded for backward compatibility
 void *wxGetSingleChoiceData( const wxString& message,
                              const wxString& caption,


@@ -317,7 +317,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
                                const wxString& message,
                                const wxString& caption,
                                int n, const wxString *choices,
                                const wxString& message,
                                const wxString& caption,
                                int n, const wxString *choices,

-                               long WXUNUSED(styleDlg), // FIXME: why unused?
+                               long styleDlg,

                                const wxPoint& pos,
                                long styleLbox)
 {
                                const wxPoint& pos,
                                long styleLbox)
 {


@@ -346,7 +346,7 @@ bool wxAnyChoiceDialog::Create(wxWindow *parent,
 #endif
 
     // 4) buttons
 #endif
 
     // 4) buttons

-    topsizer->Add( CreateButtonSizer( wxOK|wxCANCEL ), 0, wxCENTRE | wxALL, 10 );
+    topsizer->Add( CreateButtonSizer( styleDlg & (wxOK|wxCANCEL) ), 0, wxCENTRE | wxALL, 10 );

 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );
 
     SetAutoLayout( TRUE );
     SetSizer( topsizer );


@@ -384,7 +384,7 @@ wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
     Create(parent, message, caption, n, choices, clientData, style);
 }
 
     Create(parent, message, caption, n, choices, clientData, style);
 }
 

-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2

 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,
 
 wxSingleChoiceDialog::wxSingleChoiceDialog(wxWindow *parent,
                                            const wxString& message,