diff options
| author | David Robillard <d@drobilla.net> | 2014-05-13 16:26:45 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-05-13 16:26:45 +0000 |
| commit | 4b3c289fdac8a7d189464f3a56b076038aa000e0 (patch) | |
| tree | 340e2b4730f863b63e2304a6401c2ec6a01414f7 | |
| parent | 91aad360eb90b513cb21b7b62371003fb0bb4c41 (diff) | |
Minor fixes.
| -rw-r--r-- | pugl/pugl_osx.m | 5 | ||||
| -rw-r--r-- | pugl/pugl_win.cpp | 8 | ||||
| -rw-r--r-- | pugl/pugl_x11.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pugl/pugl_osx.m b/pugl/pugl_osx.m index 6f31730..e50e518 100644 --- a/pugl/pugl_osx.m +++ b/pugl/pugl_osx.m @@ -95,13 +95,16 @@ puglDisplay(PuglView* view) depthBits:(int)numDepthBits; - (void) reshape; - (void) drawRect:(NSRect)rect; +- (void) mouseEntered:(NSEvent*)event; +- (void) mouseExited:(NSEvent*)event; - (void) mouseMoved:(NSEvent*)event; - (void) mouseDragged:(NSEvent*)event; +- (void) rightMouseDragged:(NSEvent*)event; - (void) mouseDown:(NSEvent*)event; - (void) mouseUp:(NSEvent*)event; -- (void) rightMouseDragged:(NSEvent*)event; - (void) rightMouseDown:(NSEvent*)event; - (void) rightMouseUp:(NSEvent*)event; +- (void) scrollWheel:(NSEvent*)event; - (void) keyDown:(NSEvent*)event; - (void) keyUp:(NSEvent*)event; - (void) flagsChanged:(NSEvent*)event; diff --git a/pugl/pugl_win.cpp b/pugl/pugl_win.cpp index 3cdfcb5..b823001 100644 --- a/pugl/pugl_win.cpp +++ b/pugl/pugl_win.cpp @@ -37,7 +37,7 @@ # define WHEEL_DELTA 120 #endif -const int LOCAL_CLOSE_MSG = WM_USER + 50; +#define PUGL_LOCAL_CLOSE_MSG (WM_USER + 50) struct PuglInternalsImpl { HWND hwnd; @@ -114,7 +114,7 @@ puglCreateInternals(PuglNativeWindow parent, WS_EX_TOPMOST, classNameBuf, title, (visible ? WS_VISIBLE : 0) | (parent ? WS_CHILD : winFlags), - 0, 0, wr.right-wr.left, wr.bottom-wr.top, + CW_USEDEFAULT, CW_USEDEFAULT, wr.right-wr.left, wr.bottom-wr.top, (HWND)parent, NULL, NULL, NULL); if (!impl->hwnd) { @@ -334,7 +334,7 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam) } break; case WM_QUIT: - case LOCAL_CLOSE_MSG: + case PUGL_LOCAL_CLOSE_MSG: if (view->closeFunc) { view->closeFunc(view); } @@ -377,7 +377,7 @@ wndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) PostMessage(hwnd, WM_SHOWWINDOW, TRUE, 0); return 0; case WM_CLOSE: - PostMessage(hwnd, LOCAL_CLOSE_MSG, wParam, lParam); + PostMessage(hwnd, PUGL_LOCAL_CLOSE_MSG, wParam, lParam); return 0; case WM_DESTROY: return 0; diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c index 035f23b..9b04aac 100644 --- a/pugl/pugl_x11.c +++ b/pugl/pugl_x11.c @@ -150,7 +150,7 @@ puglCreateWindow(PuglView* view, const char* title) return 0; } -PUGL_API void +void puglShowWindow(PuglView* view) { PuglInternals* impl = view->impl; |