Allow using wxGraphicsContext with MinGW if gdiplus.h is available.

[wxWidgets.git] / include / wx / gtk / bmpcbox.h

diff --git a/include/wx/gtk/bmpcbox.h b/include/wx/gtk/bmpcbox.h
index b0555904f7eae0b6b10f02bd1218fc862a0143c5..bfa3399b3b38a14036896b3b954d05fb9b0ae828 100644 (file)
--- a/include/wx/gtk/bmpcbox.h
+++ b/include/wx/gtk/bmpcbox.h
@@ -3,7 +3,7 @@
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19
 // Purpose:     wxBitmapComboBox
 // Author:      Jaakko Salli
 // Created:     2008-05-19

-// RCS-ID:      $Id:
+// RCS-ID:      $Id$

 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2008 Jaakko Salli
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -125,14 +125,16 @@ public:
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 
     virtual bool IsEditable() const;
     virtual void SetEditable(bool editable);
 

-protected:
-

     virtual GtkWidget* GetConnectWidget();
     virtual GtkWidget* GetConnectWidget();

+
+protected:

     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual void GTKCreateComboBoxWidget();
     virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
 
     virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;
 
     virtual void GTKCreateComboBoxWidget();
     virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text );
 

+    virtual wxSize DoGetBestSize() const;
+

     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;
 
     wxSize                  m_bitmapSize;
     int                     m_bitmapCellIndex;