Ensure that the progress dialog parent is activated at the end under MSW.

[wxWidgets.git] / include / wx / motif / accel.h

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index f51093d326af315bfcfee9fcaf5bc04afa8abc9e..fb90ecb0b0a734b046b22cfef390a66a1e3053ce 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -16,7 +16,7 @@
 #include "wx/string.h"
 #include "wx/event.h"
 
 #include "wx/string.h"
 #include "wx/event.h"
 

-class WXDLLEXPORT wxAcceleratorTable: public wxObject
+class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject

 {
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:
 {
     DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
 public:


@@ -24,19 +24,17 @@ public:
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 
     wxAcceleratorTable(const wxString& resource); // Load from .rc resource
     wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
 

-    ~wxAcceleratorTable();
+    virtual ~wxAcceleratorTable();

 
 

-    bool operator == (const wxAcceleratorTable& accel) const { return m_refData == accel.m_refData; }
-    bool operator != (const wxAcceleratorTable& accel) const { return m_refData != accel.m_refData; }
-
-    bool Ok() const;
+    bool Ok() const { return IsOk(); }
+    bool IsOk() const;

 
     // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };
 
 
     // Implementation only
     int GetCount() const;
     wxAcceleratorEntry* GetEntries() const;
 };
 

-WXDLLEXPORT_DATA(extern wxAcceleratorTable) wxNullAcceleratorTable;
+extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;

 
 #endif
 // _WX_ACCEL_H_
 
 #endif
 // _WX_ACCEL_H_