Fix needlessly convoluted test in wxXmlResourceHandlerImpl::GetImageList().

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

diff --git a/src/generic/aboutdlgg.cpp b/src/generic/aboutdlgg.cpp
index d3d329c97f647e276b709b93ffd345fb5c6bebb4..2fe35a2800d33159f49d478ad529c239b8ce38dc 100644 (file)
--- a/src/generic/aboutdlgg.cpp
+++ b/src/generic/aboutdlgg.cpp
@@ -3,7 +3,6 @@
 // Purpose:     implements wxGenericAboutBox() function
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08
 // Purpose:     implements wxGenericAboutBox() function
 // Author:      Vadim Zeitlin
 // Created:     2006-10-08

-// RCS-ID:      $Id$

 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -223,7 +222,7 @@ bool wxGenericAboutDialog::Create(const wxAboutDialogInfo& info, wxWindow* paren
 #if !wxUSE_MODAL_ABOUT_DIALOG
     Connect(wxEVT_CLOSE_WINDOW,
             wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow));
 #if !wxUSE_MODAL_ABOUT_DIALOG
     Connect(wxEVT_CLOSE_WINDOW,
             wxCloseEventHandler(wxGenericAboutDialog::OnCloseWindow));

-    Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED,
+    Connect(wxID_OK, wxEVT_BUTTON,

             wxCommandEventHandler(wxGenericAboutDialog::OnOK));
 #endif // !wxUSE_MODAL_ABOUT_DIALOG
 
             wxCommandEventHandler(wxGenericAboutDialog::OnOK));
 #endif // !wxUSE_MODAL_ABOUT_DIALOG
 


@@ -310,7 +309,7 @@ void wxGenericAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 // currently wxAboutBox is implemented natively only under these platforms, for
 // the others we provide a generic fallback here
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && \
 // currently wxAboutBox is implemented natively only under these platforms, for
 // the others we provide a generic fallback here
 #if !defined(__WXMSW__) && !defined(__WXMAC__) && \

-        (!defined(__WXGTK26__) || defined(__WXUNIVERSAL__))
+        (!defined(__WXGTK20__) || defined(__WXUNIVERSAL__))

 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 {
 
 void wxAboutBox(const wxAboutDialogInfo& info, wxWindow* parent)
 {