Reverted changes from Vivien Delage as there were some regressions discovered. Will need to revist this code to deal with bugs that Vivien was tackling.

This commit is contained in:
Robert Osfield
2010-09-17 13:09:23 +00:00
parent 7cc2d90725
commit b0db0382f5
2 changed files with 14 additions and 75 deletions

View File

@@ -135,8 +135,7 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow, p
bool setPixelFormat();
// return true if it handled the key, otherwise return false so that we know it is WM_CHAR job to handle it
bool adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask );
void adaptKey( WPARAM wParam, LPARAM lParam, int& keySymbol, unsigned int& modifierMask );
void transformMouseXY(float& x, float& y);
@@ -180,9 +179,6 @@ class OSGVIEWER_EXPORT GraphicsWindowWin32 : public osgViewer::GraphicsWindow, p
std::map<MouseCursor,HCURSOR> _mouseCursorMap;
std::map<int, bool> _keyMap;
bool _keypresshandled;
int _lastkeysymbol;
std::map<int, int> _scancode_unicode_Map;
bool _applyWorkaroundForMultimonitorMultithreadNVidiaWin32Issues;
};