Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bda3b8060980
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: be0dc7e2cb43
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on May 20, 2019

  1. Win32: remove dead code in keyboard event handling. 

    The forwarding is now performed explicitly in the text window setup
code, so this branch never has a chance to run.
    @whitequark
    whitequark committed May 20, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e11e234 View commit details

  2. Win32: silence a GetProcAddress-related warning.

    @whitequark
    whitequark committed May 20, 2019
    Copy the full SHA
    be0dc7e View commit details
Showing with 6 additions and 7 deletions.
  1. +6 −7 src/platform/guiwin.cpp
13 changes: 6 additions & 7 deletions src/platform/guiwin.cpp
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,12 @@
# undef uint32_t
#endif

#if defined(__GNUC__)
// Disable bogus warning emitted by GCC on GetProcAddress, since there seems to be no way
// of restructuring the code to easily disable it just at the call site.
#pragma GCC diagnostic ignored "-Wcast-function-type"
#endif

namespace SolveSpace {
namespace Platform {

@@ -942,13 +948,6 @@ class WindowImplWin32 final : public Window {

if(window->onKeyboardEvent) {
window->onKeyboardEvent(event);
} else {
HWND hParent;
sscheck(hParent = GetParent(h));
if(hParent != NULL) {
sscheck(SetForegroundWindow(hParent));
sscheck(SendMessageW(hParent, msg, wParam, lParam));
}
}
break;
}