projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not #undef wxNEED_PRINTF_CONVERSION if wxVsnprintf_ has not been defined
[wxWidgets.git]
/
include
/
wx
/
clipbrd.h
diff --git
a/include/wx/clipbrd.h
b/include/wx/clipbrd.h
index d04fa7df9ab3ed415aacf80ea3601727217b69e4..ca72949a5c9a85d8746e7d3841fab0de0915c2a1 100644
(file)
--- a/
include/wx/clipbrd.h
+++ b/
include/wx/clipbrd.h
@@
-12,7
+12,7
@@
#ifndef _WX_CLIPBRD_H_BASE_
#define _WX_CLIPBRD_H_BASE_
#ifndef _WX_CLIPBRD_H_BASE_
#define _WX_CLIPBRD_H_BASE_
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface "clipboardbase.h"
#endif
#pragma interface "clipboardbase.h"
#endif
@@
-88,16
+88,16
@@
public:
#include "wx/motif/clipbrd.h"
#elif defined(__WXGTK__)
#include "wx/gtk/clipbrd.h"
#include "wx/motif/clipbrd.h"
#elif defined(__WXGTK__)
#include "wx/gtk/clipbrd.h"
+#elif defined(__WXX11__)
+ #include "wx/x11/clipbrd.h"
#elif defined(__WXMGL__)
#include "wx/mgl/clipbrd.h"
#elif defined(__WXMGL__)
#include "wx/mgl/clipbrd.h"
-#elif defined(__WXQT__)
- #include "wx/gtk/clipbrd.h"
#elif defined(__WXMAC__)
#include "wx/mac/clipbrd.h"
#elif defined(__WXMAC__)
#include "wx/mac/clipbrd.h"
+#elif defined(__WXCOCOA__)
+ #include "wx/cocoa/clipbrd.h"
#elif defined(__WXPM__)
#include "wx/os2/clipbrd.h"
#elif defined(__WXPM__)
#include "wx/os2/clipbrd.h"
-#elif defined(__WXSTUBS__)
- #include "wx/stubs/clipbrd.h"
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------
@@
-135,6
+135,8
@@
public:
private:
wxClipboard *m_clipboard;
private:
wxClipboard *m_clipboard;
+
+ DECLARE_NO_COPY_CLASS(wxClipboardLocker)
};
#endif // wxUSE_CLIPBOARD
};
#endif // wxUSE_CLIPBOARD