Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move wxBitmapComboBox dependency check to wx/chkconf.h where it belongs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-24 13:18:23 +00:00
parent ca5c6ac3f4
commit 8d37334f0e
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/bmpcbox.h
View File

@@ -26,7 +26,6 @@ extern WXDLLIMPEXP_DATA_ADV(const wxChar) wxBitmapComboBoxNameStr[];
class WXDLLIMPEXP_ADV wxBitmapComboBoxBase class WXDLLIMPEXP_ADV wxBitmapComboBoxBase
{ {
public: public:
// ctors and such // ctors and such
wxBitmapComboBoxBase() { } wxBitmapComboBoxBase() { }
@@ -40,20 +39,11 @@ public:
// Returns size of the image used in list // Returns size of the image used in list
virtual wxSize GetBitmapSize() const = 0; virtual wxSize GetBitmapSize() const = 0;
protected:
private:
}; };
#if defined(__WXUNIVERSAL__) #include "wx/generic/bmpcbox.h"
#include "wx/generic/bmpcbox.h"
#else
#include "wx/generic/bmpcbox.h"
#endif
#endif // wxUSE_BITMAPCOMBOBOX #endif // wxUSE_BITMAPCOMBOBOX
#endif #endif // _WX_BMPCBOX_H_BASE_
// _WX_BMPCBOX_H_BASE_

17
include/wx/chkconf.h
View File

@@ -316,6 +316,14 @@
# endif # endif
#endif /* !defined(wxUSE_ACCEL) */ #endif /* !defined(wxUSE_ACCEL) */
#ifndef wxUSE_BITMAPCOMBOBOX
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BITMAPCOMBOBOX must be defined."
# else
# define wxUSE_BITMAPCOMBOBOX 0
# endif
#endif /* !defined(wxUSE_BITMAPCOMBOBOX) */
#ifndef wxUSE_BMPBUTTON #ifndef wxUSE_BMPBUTTON
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxUSE_BMPBUTTON must be defined." # error "wxUSE_BMPBUTTON must be defined."
@@ -1202,6 +1210,15 @@
# endif # endif
#endif /* wxUSE_CHOICEBOOK */ #endif /* wxUSE_CHOICEBOOK */
#if !wxUSE_ODCOMBOBOX
# if wxUSE_BITMAPCOMBOBOX
# error "wxBitmapComboBox requires wxOwnerDrawnComboBox"
# else
# undef wxUSE_BITMAPCOMBOBOX
# define wxUSE_BITMAPCOMBOBOX 0
# endif
#endif /* !wxUSE_ODCOMBOBOX */
/* don't attempt to use native status bar on the platforms not having it */ /* don't attempt to use native status bar on the platforms not having it */
#ifndef wxUSE_NATIVE_STATUSBAR #ifndef wxUSE_NATIVE_STATUSBAR
# define wxUSE_NATIVE_STATUSBAR 0 # define wxUSE_NATIVE_STATUSBAR 0

9
include/wx/generic/bmpcbox.h
View File

@@ -15,13 +15,8 @@
#define wxGENERIC_BITMAPCOMBOBOX 1 #define wxGENERIC_BITMAPCOMBOBOX 1
#if !wxUSE_ODCOMBOBOX
#error "Generic wxBitmapComboBox depends on wxOwnerDrawnComboBox"
#endif
#include "wx/odcombo.h" #include "wx/odcombo.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxBitmapComboBox: a wxComboBox that allows images to be shown // wxBitmapComboBox: a wxComboBox that allows images to be shown
// in front of string items. // in front of string items.
@@ -172,6 +167,4 @@ private:
DECLARE_DYNAMIC_CLASS(wxBitmapComboBox) DECLARE_DYNAMIC_CLASS(wxBitmapComboBox)
}; };
#endif // _WX_GENERIC_BMPCBOX_H_
#endif
// _WX_GENERIC_BMPCBOX_H_