diff options
author | Stephen Swaney <sswaney@centurytel.net> | 2007-03-20 07:19:30 +0300 |
---|---|---|
committer | Stephen Swaney <sswaney@centurytel.net> | 2007-03-20 07:19:30 +0300 |
commit | 03edb15afd96cbb476fa9e254acd96298b8083e4 (patch) | |
tree | d17dfb76db17905957b5e650fc80b8869aab9834 /intern | |
parent | 7f2d1f651ca77e472a7b66b8c0eb8dbffe94ff34 (diff) |
cleanup compiler warnings for
missing virtual destructors
out of order initializers
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_Buttons.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Buttons.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ModifierKeys.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ModifierKeys.h | 2 | ||||
-rwxr-xr-x | intern/ghost/intern/GHOST_WindowX11.cpp | 6 |
5 files changed, 11 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_Buttons.cpp b/intern/ghost/intern/GHOST_Buttons.cpp index 96ac87925db..def01b0786f 100644 --- a/intern/ghost/intern/GHOST_Buttons.cpp +++ b/intern/ghost/intern/GHOST_Buttons.cpp @@ -77,3 +77,5 @@ void GHOST_Buttons::clear() m_ButtonMiddle = false; m_ButtonRight = false; } + +GHOST_Buttons::~GHOST_Buttons() {} diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h index ddf5eebe6dd..e244d54b2c6 100644 --- a/intern/ghost/intern/GHOST_Buttons.h +++ b/intern/ghost/intern/GHOST_Buttons.h @@ -50,6 +50,8 @@ struct GHOST_Buttons { * Constructor. */ GHOST_Buttons(); + + virtual ~GHOST_Buttons(); /** * Returns the state of a single button. diff --git a/intern/ghost/intern/GHOST_ModifierKeys.cpp b/intern/ghost/intern/GHOST_ModifierKeys.cpp index 3e1b7fcc4cd..36293d87c26 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.cpp +++ b/intern/ghost/intern/GHOST_ModifierKeys.cpp @@ -49,6 +49,8 @@ GHOST_ModifierKeys::GHOST_ModifierKeys() clear(); } +GHOST_ModifierKeys::~GHOST_ModifierKeys() {} + GHOST_TKey GHOST_ModifierKeys::getModifierKeyCode(GHOST_TModifierKeyMask mask) { diff --git a/intern/ghost/intern/GHOST_ModifierKeys.h b/intern/ghost/intern/GHOST_ModifierKeys.h index 067b66dd106..6b26dd5829e 100644 --- a/intern/ghost/intern/GHOST_ModifierKeys.h +++ b/intern/ghost/intern/GHOST_ModifierKeys.h @@ -51,6 +51,8 @@ struct GHOST_ModifierKeys */ GHOST_ModifierKeys(); + virtual ~GHOST_ModifierKeys(); + /** * Returns the modifier key's key code from a modifier key mask. * @param mask The mask of the modifier key. diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 0fe101ab258..cb356e0796e 100755 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -65,11 +65,11 @@ GHOST_WindowX11( const bool stereoVisual ) : GHOST_Window(title,left,top,width,height,state,type,stereoVisual), + m_context(NULL), m_display(display), - m_valid_setup (false), m_system (system), + m_valid_setup (false), m_invalid_window(false), - m_context(NULL), m_empty_cursor(None), m_custom_cursor(None) { @@ -476,7 +476,7 @@ setState( ){ //TODO - if (state == getState()) { + if (state == (int)getState()) { return GHOST_kSuccess; } else { return GHOST_kFailure; |