correction to last commit: Korean and Romanian translations will only be in 2.9.1...

[wxWidgets.git] / src / motif / accel.cpp

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 1a2f7fd39356342f7be3588e07e7b71a5ec396c3..3aad0fb5b533a8f29bf1d9e62a1b00d064c5421c 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -25,7 +25,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {

-    friend class WXDLLEXPORT wxAcceleratorTable;
+    friend class wxAcceleratorTable;

 public:
     wxAcceleratorRefData();
     virtual ~wxAcceleratorRefData();
 public:
     wxAcceleratorRefData();
     virtual ~wxAcceleratorRefData();


@@ -40,19 +40,19 @@ public:
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
     m_count = 0;
 wxAcceleratorRefData::wxAcceleratorRefData()
 {
     m_count = 0;

-    m_entries = (wxAcceleratorEntry*) NULL;
+    m_entries = NULL;

 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
     delete[] m_entries;
 }
 
 wxAcceleratorRefData::~wxAcceleratorRefData()
 {
     delete[] m_entries;

-    m_entries = (wxAcceleratorEntry*) NULL;
+    m_entries = NULL;

     m_count = 0;
 }
 
 wxAcceleratorTable::wxAcceleratorTable()
 {
     m_count = 0;
 }
 
 wxAcceleratorTable::wxAcceleratorTable()
 {

-    m_refData = (wxAcceleratorRefData*) NULL;
+    m_refData = NULL;

 }
 
 wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 wxAcceleratorTable::~wxAcceleratorTable()


@@ -82,7 +82,7 @@ wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]
 
 bool wxAcceleratorTable::IsOk() const
 {
 
 bool wxAcceleratorTable::IsOk() const
 {

-    return (m_refData != (wxAcceleratorRefData*) NULL);
+    return (m_refData != NULL);

 }
 
 int wxAcceleratorTable::GetCount() const
 }
 
 int wxAcceleratorTable::GetCount() const