fix memory leak; allocate the DC before SetFont() is called on the status bar

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

diff --git a/include/wx/motif/accel.h b/include/wx/motif/accel.h
index d67392b8eecc2306c631a7918ca8a0aeb091ef6c..5ae1a3a2fabf0e4a239bdc79952929c3df811004 100644 (file)
--- a/include/wx/motif/accel.h
+++ b/include/wx/motif/accel.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        accel.h
+// Name:        wx/motif/accel.h

 // Purpose:     wxAcceleratorTable class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxAcceleratorTable class
 // Author:      Julian Smart
 // Modified by:


@@ -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 Ok() const { return IsOk(); }
+    bool IsOk() const;

 
 

-    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;
-    

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

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

 
 #endif
 // _WX_ACCEL_H_
 
 #endif
 // _WX_ACCEL_H_