X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..a43a4f9d4d4a7f107e81bc7de0c1eea729593ee2:/include/wx/msw/clipbrd.h

diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h
index abdabfb142..ac81d40d45 100644
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __CLIPBRDH__
-#define __CLIPBRDH__
+#ifndef _WX_CLIPBRD_H_
+#define _WX_CLIPBRD_H_
 
 #ifdef __GNUG__
 #pragma interface "clipbrd.h"
@@ -19,20 +19,20 @@
 #include "wx/defs.h"
 #include "wx/setup.h"
 
-#if USE_CLIPBOARD
+#if wxUSE_CLIPBOARD
 
 #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.
@@ -101,11 +101,11 @@ class WXDLLEXPORT wxClipboard : public wxObject
 };
 
 /* Initialize wxTheClipboard. Can be called repeatedly */
-void WXDLLEXPORT wxInitClipboard(void);
+WXDLLEXPORT void wxInitClipboard(void);
 
 /* The clipboard */
-extern wxClipboard* WXDLLEXPORT wxTheClipboard;
+WXDLLEXPORT_DATA(extern wxClipboard*) wxTheClipboard;
 
-#endif // USE_CLIPBOARD
+#endif // wxUSE_CLIPBOARD
 #endif
-    // __CLIPBRDH__
+    // _WX_CLIPBRD_H_