mirror of
https://github.com/cjcliffe/CubicSDR.git
synced 2024-11-14 16:11:47 -05:00
Merge branch 'master' into winbuild-updates
This commit is contained in:
commit
674bfa1246
@ -689,7 +689,7 @@ IF (NOT BUNDLE_APP)
|
||||
configure_files(${CUBICSDR_HEADER_IMAGE_DIR} ${CMAKE_BINARY_DIR}/${EX_PLATFORM_NAME} ${CUBICSDR_HEADER_IMAGE_FILE})
|
||||
ENDIF()
|
||||
add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers} ${RES_FILES})
|
||||
target_link_libraries(CubicSDR ${LIQUID_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
|
||||
target_link_libraries(CubicSDR ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${OTHER_LIBRARIES})
|
||||
ENDIF (NOT BUNDLE_APP)
|
||||
|
||||
IF (MSVC)
|
||||
|
@ -269,7 +269,7 @@ void TuningCanvas::StepTuner(ActiveState state, TuningDirection tuningDir, int d
|
||||
}
|
||||
}
|
||||
|
||||
void TuningCanvas::OnIdle(wxIdleEvent & /* event */) {
|
||||
void TuningCanvas::OnIdle(wxIdleEvent & event) {
|
||||
if (mouseTracker.mouseDown()) {
|
||||
if (downState != TUNING_HOVER_NONE) {
|
||||
dragAccum += 5.0*mouseTracker.getOriginDeltaMouseX();
|
||||
|
@ -482,7 +482,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
|
||||
}
|
||||
|
||||
}
|
||||
void WaterfallCanvas::OnIdle(wxIdleEvent & /* event */) {
|
||||
void WaterfallCanvas::OnIdle(wxIdleEvent & event) {
|
||||
processInputQueue();
|
||||
Refresh();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user