]> git.saurik.com Git - wxWidgets.git/blobdiff - include/wx/access.h
Resolved CVS conflict
[wxWidgets.git] / include / wx / access.h
index b7b80b84fa74aa34850abe7698157f809d115a9d..4d320fef4770d46f4db514b3d67df8ef43a7522b 100644 (file)
@@ -12,7 +12,7 @@
 #ifndef _WX_ACCESSBASE_H_
 #define _WX_ACCESSBASE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "accessbase.h"
 #endif
 
@@ -51,7 +51,7 @@ typedef enum
 
 // Role constants
 
-typedef enum {  
+typedef enum {
     wxROLE_NONE,
     wxROLE_SYSTEM_ALERT,
     wxROLE_SYSTEM_ANIMATION,
@@ -233,8 +233,8 @@ class WXDLLEXPORT wxAccessibleBase : public wxObject
     DECLARE_NO_COPY_CLASS(wxAccessibleBase)
 
 public:
-    wxAccessibleBase(wxWindow* win): m_window(win) {};
-    virtual ~wxAccessibleBase() {};
+    wxAccessibleBase(wxWindow* win): m_window(win) {}
+    virtual ~wxAccessibleBase() {}
 
 // Overridables