Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / combo.h

diff --git a/include/wx/combo.h b/include/wx/combo.h
index 76bf25f53276dc221cad2efcd72ba838a7ce81ec..4bae2cfea63995537e378b64783d25d8e4541808 100644 (file)
--- a/include/wx/combo.h
+++ b/include/wx/combo.h
@@ -4,7 +4,6 @@
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006

-// RCS-ID:      $Id$

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


@@ -471,6 +470,10 @@ public:
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return m_mainCtrlWnd; }
 
     virtual wxWindow *GetMainWindowOfCompositeControl()
         { return m_mainCtrlWnd; }
 

+    // also set the embedded wxTextCtrl colours
+    virtual bool SetForegroundColour(const wxColour& colour);
+    virtual bool SetBackgroundColour(const wxColour& colour);
+

 protected:
 
     // Returns true if hint text should be drawn in the control
 protected:
 
     // Returns true if hint text should be drawn in the control


@@ -546,10 +549,6 @@ protected:
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 
     virtual wxSize DoGetBestSize() const;
     virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const;
 

-    // also set the embedded wxTextCtrl colours
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetBackgroundColour(const wxColour& colour);
-

     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);
 
     // NULL popup can be used to indicate default in a derived class
     virtual void DoSetPopupControl(wxComboPopup* popup);