projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
size_t is always unsigned....
[wxWidgets.git]
/
include
/
wx
/
bmpbuttn.h
diff --git
a/include/wx/bmpbuttn.h
b/include/wx/bmpbuttn.h
index ee7a64bf0b151c06986df51fe37ec8594b497932..ebaafefda3e9d55d27add37d2e35bf9e8bac3f02 100644
(file)
--- a/
include/wx/bmpbuttn.h
+++ b/
include/wx/bmpbuttn.h
@@
-12,6
+12,8
@@
#ifndef _WX_BMPBUTTON_H_BASE_
#define _WX_BMPBUTTON_H_BASE_
#ifndef _WX_BMPBUTTON_H_BASE_
#define _WX_BMPBUTTON_H_BASE_
+#include "wx/defs.h"
+
#if wxUSE_BMPBUTTON
#include "wx/bitmap.h"
#if wxUSE_BMPBUTTON
#include "wx/bitmap.h"
@@
-72,10
+74,13
@@
protected:
// the margins around the bitmap
int m_marginX,
m_marginY;
// the margins around the bitmap
int m_marginX,
m_marginY;
+
private:
// Prevent Virtual function hiding warnings
void SetLabel(const wxString& rsLabel)
private:
// Prevent Virtual function hiding warnings
void SetLabel(const wxString& rsLabel)
- { wxWindowBase::SetLabel(rsLabel); }
+ { wxWindowBase::SetLabel(rsLabel); }
+
+ DECLARE_NO_COPY_CLASS(wxBitmapButtonBase)
};
#if defined(__WXUNIVERSAL__)
};
#if defined(__WXUNIVERSAL__)
@@
-88,10
+93,10
@@
private:
#include "wx/gtk/bmpbuttn.h"
#elif defined(__WXMAC__)
#include "wx/mac/bmpbuttn.h"
#include "wx/gtk/bmpbuttn.h"
#elif defined(__WXMAC__)
#include "wx/mac/bmpbuttn.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/bmpbuttn.h"
#elif defined(__WXPM__)
#include "wx/os2/bmpbuttn.h"
#elif defined(__WXPM__)
#include "wx/os2/bmpbuttn.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/bmpbuttn.h"
#endif
#endif // wxUSE_BMPBUTTON
#endif
#endif // wxUSE_BMPBUTTON