Added native wxInfoBar implementation for wxGTK.

Straightforward implementation of wxInfoBar using GtkInfoBar widget available
in GTK+ 2.18.

Some side effects of this change:

- Rename wxInfoBar version in wx/generic/infobar.h to wxInfoBarGeneric and
  define wxInfoBar in wx/infobar.h.
- Also change default value of flags argument to ShowMessage() to
  wxICON_INFORMATION from wxICON_NONE as the default colour for wxICON_NONE
  messages is surprisingly ugly in GTK native version.

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

include/wx/generic/infobar.h

@@ -19,14 +19,14 @@ class WXDLLIMPEXP_FWD_CORE wxStaticText;
 // wxInfoBar
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxInfoBar : public wxInfoBarBase
+class WXDLLIMPEXP_ADV wxInfoBarGeneric : public wxInfoBarBase
 {
 public:
     // the usual ctors and Create() but remember that info bar is created
     // hidden
-    wxInfoBar() { Init(); }
+    wxInfoBarGeneric() { Init(); }
 
-    wxInfoBar(wxWindow *parent, wxWindowID winid = wxID_ANY)
+    wxInfoBarGeneric(wxWindow *parent, wxWindowID winid = wxID_ANY)
     {
         Init();
         Create(parent, winid);
@@ -38,7 +38,8 @@ public:
     // implement base class methods
     // ----------------------------
 
-    virtual void ShowMessage(const wxString& msg, int flags = wxICON_NONE);
+    virtual void ShowMessage(const wxString& msg,
+                             int flags = wxICON_INFORMATION);
 
     virtual void AddButton(wxWindowID btnid, const wxString& label = wxString());
 
@@ -76,6 +77,11 @@ public:
     // (default font is a larger and bold version of the normal one)
     virtual bool SetFont(const wxFont& font);
 
+protected:
+    // update the parent to take our new or changed size into account (notably
+    // should be called when we're shown or hidden)
+    void UpdateParent();
+
 private:
     // common part of all ctors
     void Init();
@@ -83,9 +89,6 @@ private:
     // handler for the close button
     void OnButton(wxCommandEvent& event);
 
-    // update the parent after we're shown or hidden
-    void UpdateParent();
-
     // change the parent background colour to match that of our sibling
     void ChangeParentBackground();
 
@@ -110,7 +113,7 @@ private:
     // the original parent background colour, before we changed it
     wxColour m_origParentBgCol;
 
-    wxDECLARE_NO_COPY_CLASS(wxInfoBar);
+    wxDECLARE_NO_COPY_CLASS(wxInfoBarGeneric);
 };
 
 #endif // _WX_GENERIC_INFOBAR_H_

include/wx/gtk/infobar.h

@@ -0,0 +1,64 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/gtk/infobar.h
+// Purpose:     native implementation of wxInfoBar for GTK+ 2.18 and later
+// Author:      Vadim Zeitlin
+// Created:     2009-09-26
+// RCS-ID:      $Id: wxhead.h,v 1.11 2009-06-29 10:23:04 zeitlin Exp $
+// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_GTK_INFOBAR_H_
+#define _WX_GTK_INFOBAR_H_
+
+#include "wx/generic/infobar.h"
+
+// ----------------------------------------------------------------------------
+// wxInfoBar for GTK+
+// ----------------------------------------------------------------------------
+
+// notice that the native GTK+ implementation is only available since
+// (relatively recent) 2.18 so we inherit from the generic one to be able to
+// fall back to it if GTK+ version is determined to be too old during run-time
+class WXDLLIMPEXP_ADV wxInfoBar : public wxInfoBarGeneric
+{
+public:
+    wxInfoBar() { Init(); }
+
+    wxInfoBar(wxWindow *parent, wxWindowID winid = wxID_ANY)
+    {
+        Init();
+        Create(parent, winid);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY);
+
+    virtual ~wxInfoBar();
+
+    // implement base class methods
+    // ----------------------------
+
+    virtual void ShowMessage(const wxString& msg,
+                             int flags = wxICON_INFORMATION);
+
+    virtual void AddButton(wxWindowID btnid,
+                           const wxString& label = wxString());
+
+    // implementation only
+    // -------------------
+
+    void GTKResponse(int btnid);
+
+protected:
+    virtual bool GTKShouldConnectSizeRequest() const { return false; }
+
+private:
+    void Init() { m_label = NULL; }
+
+    GtkWidget *m_label;
+
+    wxDECLARE_NO_COPY_CLASS(wxInfoBar);
+};
+
+#endif // _WX_GTK_INFOBAR_H_
+

include/wx/infobar.h

@@ -21,7 +21,7 @@
 // wxInfoBar shows non-critical but important information to the user
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_ADV wxInfoBarBase : public wxWindow
+class WXDLLIMPEXP_ADV wxInfoBarBase : public wxControl
 {
 public:
     // real ctors are provided by the derived classes, just notice that unlike
@@ -33,7 +33,8 @@ public:
 
 
     // show the info bar with the given message and optionally an icon
-    virtual void ShowMessage(const wxString& msg, int flags = wxICON_NONE) = 0;
+    virtual void ShowMessage(const wxString& msg,
+                             int flags = wxICON_INFORMATION) = 0;
 
     // add an extra button to the bar, near the message
     virtual void AddButton(wxWindowID btnid,
@@ -43,10 +44,20 @@ private:
     wxDECLARE_NO_COPY_CLASS(wxInfoBarBase);
 };
 
-// include platform-dependent implementation
-//
-// TODO-GTK: implement a native version using GtkInfoBar (GTK+ 2.18+)
-#include "wx/generic/infobar.h"
+// currently only GTK+ has a native implementation
+#if defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
+    #include <gtk/gtkversion.h>
+    #if GTK_CHECK_VERSION(2, 18, 0)
+        #include "wx/gtk/infobar.h"
+        #define wxHAS_NATIVE_INFOBAR
+    #endif
+#endif // wxGTK2
+
+// if the generic version is the only one we have, use it
+#ifndef wxHAS_NATIVE_INFOBAR
+    #include "wx/generic/infobar.h"
+    #define wxInfoBar wxInfoBarGeneric
+#endif
 
 #endif // wxUSE_INFOBAR