Added wxTolBar::etMargins

[wxWidgets.git] / include / wx / msw / clipbrd.h

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index 8d4d4edfb23af8ea1d0b38d9ca0eb28b4d89f37f..ac81d40d459ed09d01b476b2904155d5dfed587d 100644 (file)
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -19,20 +19,20 @@
 #include "wx/defs.h"
 #include "wx/setup.h"
 
 #include "wx/defs.h"
 #include "wx/setup.h"
 

-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD

 
 #include "wx/list.h"
 
 
 #include "wx/list.h"
 

-bool WXDLLEXPORT wxOpenClipboard(void);
-bool WXDLLEXPORT wxClipboardOpen(void);
-bool WXDLLEXPORT wxCloseClipboard(void);
-bool WXDLLEXPORT wxEmptyClipboard(void);
-bool WXDLLEXPORT wxIsClipboardFormatAvailable(int dataFormat);
-bool WXDLLEXPORT wxSetClipboardData(int dataFormat, wxObject *obj, int width = 0, int height = 0);
-wxObject* WXDLLEXPORT wxGetClipboardData(int dataFormat, long *len = NULL);
-int  WXDLLEXPORT wxEnumClipboardFormats(int dataFormat);
-int  WXDLLEXPORT wxRegisterClipboardFormat(char *formatName);
-bool WXDLLEXPORT wxGetClipboardFormatName(int dataFormat, char *formatName, int maxCount);
+WXDLLEXPORT bool wxOpenClipboard(void);
+WXDLLEXPORT bool wxClipboardOpen(void);
+WXDLLEXPORT bool wxCloseClipboard(void);
+WXDLLEXPORT bool wxEmptyClipboard(void);
+WXDLLEXPORT bool wxIsClipboardFormatAvailable(int dataFormat);
+WXDLLEXPORT bool wxSetClipboardData(int dataFormat, wxObject *obj, int width = 0, int height = 0);
+WXDLLEXPORT wxObject* wxGetClipboardData(int dataFormat, long *len = NULL);
+WXDLLEXPORT int  wxEnumClipboardFormats(int dataFormat);
+WXDLLEXPORT int  wxRegisterClipboardFormat(char *formatName);
+WXDLLEXPORT bool wxGetClipboardFormatName(int dataFormat, char *formatName, int maxCount);

 
 /* The following is Matthew Flatt's implementation of the MSW
  * side of generic clipboard functionality.
 
 /* The following is Matthew Flatt's implementation of the MSW
  * side of generic clipboard functionality.


@@ -101,11 +101,11 @@ class WXDLLEXPORT wxClipboard : public wxObject
 };
 
 /* Initialize wxTheClipboard. Can be called repeatedly */
 };
 
 /* Initialize wxTheClipboard. Can be called repeatedly */

-void WXDLLEXPORT wxInitClipboard(void);
+WXDLLEXPORT void wxInitClipboard(void);

 
 /* The clipboard */
 
 /* The clipboard */

-extern wxClipboard* WXDLLEXPORT wxTheClipboard;
+WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;

 
 

-#endif // USE_CLIPBOARD
+#endif // wxUSE_CLIPBOARD

 #endif
     // _WX_CLIPBRD_H_
 #endif
     // _WX_CLIPBRD_H_