Fixed initialisation order warning

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

diff --git a/include/wx/bmpcbox.h b/include/wx/bmpcbox.h
index 1cd4ea9371b8cf80d899ee40e72fee2be91135a3..2de65ac579b672e7009ec7d68913c8a8382c99b3 100644 (file)
--- a/include/wx/bmpcbox.h
+++ b/include/wx/bmpcbox.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     Aug-31-2006
 // Copyright:   (c) Jaakko Salli
 // Modified by:
 // Created:     Aug-31-2006
 // Copyright:   (c) Jaakko Salli

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

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -26,7 +26,6 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 {
 public:
 class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
 {
 public:

-

     // ctors and such
     wxBitmapComboBoxBase() { }
 
     // ctors and such
     wxBitmapComboBoxBase() { }
 


@@ -40,20 +39,11 @@ public:
 
     // Returns size of the image used in list
     virtual wxSize GetBitmapSize() const = 0;
 
     // Returns size of the image used in list
     virtual wxSize GetBitmapSize() const = 0;

-
-protected:
-
-private:

 };
 
 
 };
 
 

-#if defined(__WXUNIVERSAL__)
-    #include "wx/generic/bmpcbox.h"
-#else
-    #include "wx/generic/bmpcbox.h"
-#endif
+#include "wx/generic/bmpcbox.h"

 
 #endif // wxUSE_BITMAPCOMBOBOX
 
 
 #endif // wxUSE_BITMAPCOMBOBOX
 

-#endif
-    // _WX_BMPCBOX_H_BASE_
+#endif // _WX_BMPCBOX_H_BASE_