Browse Source

Workaround for VS2005 compiler bugs.

tags/2021-05-28
jules 13 years ago
parent
commit
7a36867150
2 changed files with 14 additions and 11 deletions
  1. +8
    -8
      extras/JuceDemo/Source/demos/OpenGLDemo.cpp
  2. +6
    -3
      modules/juce_gui_basics/widgets/juce_Slider.cpp

+ 8
- 8
extras/JuceDemo/Source/demos/OpenGLDemo.cpp View File

@@ -109,14 +109,14 @@ public:
{
OpenGLHelpers::clear (Colours::darkgrey.withAlpha (1.0f));
{
MessageManagerLock mm (Thread::getCurrentThread());
if (! mm.lockWasGained())
return;
updateTextureImage(); // this will update our dynamically-changing texture image.
drawBackground2DStuff(); // draws some 2D content to demonstrate the OpenGLGraphicsContext class
}
{
MessageManagerLock mm (Thread::getCurrentThread());
if (! mm.lockWasGained())
return;
updateTextureImage(); // this will update our dynamically-changing texture image.
drawBackground2DStuff(); // draws some 2D content to demonstrate the OpenGLGraphicsContext class
}
// Having used the juce 2D renderer, it will have messed-up a whole load of GL state, so
// we'll put back any important settings before doing our normal GL 3D drawing..


+ 6
- 3
modules/juce_gui_basics/widgets/juce_Slider.cpp View File

@@ -330,7 +330,8 @@ public:
cancelPendingUpdate();
Component::BailOutChecker checker (&owner);
listeners.callChecked (checker, &SliderListener::sliderValueChanged, &owner); // (can't use Slider::Listener due to idiotic VC2005 bug)
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderValueChanged, slider); // (can't use Slider::Listener due to idiotic VC2005 bug)
}
void sendDragStart()
@@ -338,7 +339,8 @@ public:
owner.startedDragging();
Component::BailOutChecker checker (&owner);
listeners.callChecked (checker, &SliderListener::sliderDragStarted, &owner);
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderDragStarted, slider);
}
void sendDragEnd()
@@ -348,7 +350,8 @@ public:
sliderBeingDragged = -1;
Component::BailOutChecker checker (&owner);
listeners.callChecked (checker, &SliderListener::sliderDragEnded, &owner);
Slider* slider = &owner; // (must use an intermediate variable here to avoid a VS2005 compiler bug)
listeners.callChecked (checker, &SliderListener::sliderDragEnded, slider);
}
void buttonClicked (Button* button)


Loading…
Cancel
Save