use best size instead of hard coded 80*26 in SetSize(wxSIZE_AUTO)

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

diff --git a/src/motif/accel.cpp b/src/motif/accel.cpp
index 4c87676c43b5507c771923e79a7b046455fe5585..31a790d997477a339966f7f26cb240602dd0ee27 100644 (file)
--- a/src/motif/accel.cpp
+++ b/src/motif/accel.cpp
@@ -9,7 +9,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "accel.h"
 #endif
 
 #pragma implementation "accel.h"
 #endif
 


@@ -19,9 +19,7 @@
 #include "wx/utils.h"
 #include <ctype.h>
 
 #include "wx/utils.h"
 #include <ctype.h>
 

-#if !USE_SHARED_LIBRARIES

 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxAcceleratorTable, wxObject)

-#endif

 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {
 
 class WXDLLEXPORT wxAcceleratorRefData: public wxObjectRefData
 {


@@ -61,13 +59,13 @@ wxAcceleratorTable::~wxAcceleratorTable()
 }
 
 // Load from .rc resource
 }
 
 // Load from .rc resource

-wxAcceleratorTable::wxAcceleratorTable(const wxString& resource)
+wxAcceleratorTable::wxAcceleratorTable(const wxString& WXUNUSED(resource))

 {
     m_refData = new wxAcceleratorRefData;
 }
 
 // Create from an array
 {
     m_refData = new wxAcceleratorRefData;
 }
 
 // Create from an array

-wxAcceleratorTable::wxAcceleratorTable(int n, wxAcceleratorEntry entries[])
+wxAcceleratorTable::wxAcceleratorTable(int n, const wxAcceleratorEntry entries[])

 {
     wxAcceleratorRefData* data = new wxAcceleratorRefData;
     m_refData = data;
 {
     wxAcceleratorRefData* data = new wxAcceleratorRefData;
     m_refData = data;


@@ -101,7 +99,7 @@ bool wxAcceleratorEntry::MatchesEvent(const wxKeyEvent& event) const
     bool eventAltDown = event.AltDown();
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();
     bool eventAltDown = event.AltDown();
     bool eventCtrlDown = event.ControlDown();
     bool eventShiftDown = event.ShiftDown();

-    int  eventKeyCode = event.KeyCode();
+    int  eventKeyCode = event.GetKeyCode();

 
     bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
     bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);
 
     bool accAltDown = ((GetFlags() & wxACCEL_ALT) == wxACCEL_ALT);
     bool accCtrlDown = ((GetFlags() & wxACCEL_CTRL) == wxACCEL_CTRL);