Mouse fix for audio plugins in Muse Receptor. Fixed DrawableText constructor.

extras/audio plugins/wrapper/RTAS/juce_RTAS_Wrapper.cpp

@@ -109,7 +109,7 @@
 #undef MemoryBlock
 
 //==============================================================================
-#if JUCE_WIN32
+#if JUCE_WINDOWS
   extern void JUCE_CALLTYPE attachSubWindow (void* hostWindow, int& titleW, int& titleH, JUCE_NAMESPACE::Component* comp);
   extern void JUCE_CALLTYPE resizeHostWindow (void* hostWindow, int& titleW, int& titleH, JUCE_NAMESPACE::Component* comp);
  #if ! JucePlugin_EditorRequiresKeyboardFocus
@@ -257,7 +257,7 @@ public:
             {
                 updateSize();
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
                 void* const hostWindow = (void*) ASI_GethWnd ((WindowPtr) port);
 #else
                 void* const hostWindow = (void*) GetWindowFromPort (port);
@@ -276,7 +276,7 @@ public:
 
         void DrawContents (Rect*)
         {
-#if JUCE_WIN32
+#if JUCE_WINDOWS
             if (wrapper != 0)
             {
                 ComponentPeer* const peer = wrapper->getPeer();
@@ -346,21 +346,21 @@ public:
                 editorComp->setTopLeftPosition (0, 0);
                 addAndMakeVisible (editorComp);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
                 attachSubWindow (hostWindow, titleW, titleH, this);
 #else
                 nsWindow = attachSubWindow (hostWindow, this);
 #endif
                 setVisible (true);
 
-#if JUCE_WIN32 && ! JucePlugin_EditorRequiresKeyboardFocus
+#if JUCE_WINDOWS && ! JucePlugin_EditorRequiresKeyboardFocus
                 Desktop::getInstance().addFocusChangeListener (this);
 #endif
             }
 
             ~EditorCompWrapper()
             {
-#if JUCE_WIN32 && ! JucePlugin_EditorRequiresKeyboardFocus
+#if JUCE_WINDOWS && ! JucePlugin_EditorRequiresKeyboardFocus
                 Desktop::getInstance().removeFocusChangeListener (this);
 #endif
 
@@ -383,7 +383,7 @@ public:
                 repaint();
             }
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
             void globalFocusChanged (JUCE_NAMESPACE::Component*)
             {
   #if ! JucePlugin_EditorRequiresKeyboardFocus
@@ -398,7 +398,7 @@ public:
                 setSize (child->getWidth(), child->getHeight());
                 child->setTopLeftPosition (0, 0);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
                 resizeHostWindow (hostWindow, titleW, titleH, this);
 #endif
                 owner->updateSize();
@@ -954,7 +954,7 @@ private:
     static CEffectProcess* createNewProcess()
     {
         // Juce setup
-#if JUCE_WIN32
+#if JUCE_WINDOWS
         PlatformUtilities::setCurrentModuleInstanceHandle (gThisModule);
 #endif
         initialiseJuce_GUI();

extras/audio plugins/wrapper/VST/juce_VST_Wrapper.cpp

@@ -165,7 +165,7 @@ END_JUCE_NAMESPACE
 
 
 //==============================================================================
-#if JUCE_WIN32
+#if JUCE_WINDOWS
 
 static HWND findMDIParentOf (HWND w)
 {
@@ -255,104 +255,8 @@ juce_ImplementSingleton (SharedMessageThread)
 
 #endif
 
-//==============================================================================
-// A component to hold the AudioProcessorEditor, and cope with some housekeeping
-// chores when it changes or repaints.
-class EditorCompWrapper  : public Component,
-                           public AsyncUpdater
-{
-    JuceVSTWrapper* wrapper;
-
-public:
-    EditorCompWrapper (JuceVSTWrapper* const wrapper_,
-                       AudioProcessorEditor* const editor)
-        : wrapper (wrapper_)
-    {
-        setOpaque (true);
-        editor->setOpaque (true);
-
-        setBounds (editor->getBounds());
-        editor->setTopLeftPosition (0, 0);
-        addAndMakeVisible (editor);
-
-#if JUCE_WIN32
-        addMouseListener (this, true);
-#endif
-    }
-
-    ~EditorCompWrapper()
-    {
-        deleteAllChildren();
-    }
-
-    void paint (Graphics& g)
-    {
-    }
-
-    void paintOverChildren (Graphics& g)
-    {
-        // this causes an async call to masterIdle() to help
-        // creaky old DAWs like Nuendo repaint themselves while we're
-        // repainting. Otherwise they just seem to give up and sit there
-        // waiting.
-        triggerAsyncUpdate();
-    }
-
-#if JUCE_MAC
-    bool keyPressed (const KeyPress& kp)
-    {
-        // If we have an unused keypress, move the key-focus to a host window
-        // and re-inject the event..
-        forwardCurrentKeyEventToHost (this);
-        return true;
-    }
-#endif
-
-    AudioProcessorEditor* getEditorComp() const
-    {
-        return dynamic_cast <AudioProcessorEditor*> (getChildComponent (0));
-    }
-
-    void resized()
-    {
-        Component* const c = getChildComponent (0);
-
-        if (c != 0)
-            c->setBounds (0, 0, getWidth(), getHeight());
-    }
-
-    void childBoundsChanged (Component* child);
-    void handleAsyncUpdate();
-
-#if JUCE_WIN32
-    void mouseDown (const MouseEvent&)
-    {
-        broughtToFront();
-    }
-
-    void broughtToFront()
-    {
-        // for hosts like nuendo, need to also pop the MDI container to the
-        // front when our comp is clicked on.
-        HWND parent = findMDIParentOf ((HWND) getWindowHandle());
-
-        if (parent != 0)
-        {
-            SetWindowPos (parent,
-                          HWND_TOP,
-                          0, 0, 0, 0,
-                          SWP_NOMOVE | SWP_NOSIZE);
-        }
-    }
-#endif
-
-    //==============================================================================
-    juce_UseDebuggingNewOperator
-};
-
 static Array<void*> activePlugins;
 
-
 //==============================================================================
 /**
     This wraps an AudioProcessor as an AudioEffectX...
@@ -642,7 +546,7 @@ public:
 
             filter->setNonRealtime (getCurrentProcessLevel() == 4 /* kVstProcessLevelOffline */);
 
-#if JUCE_WIN32
+#if JUCE_WINDOWS
             if (GetThreadPriority (GetCurrentThread()) <= THREAD_PRIORITY_NORMAL
                   && GetThreadPriority (GetCurrentThread()) >= THREAD_PRIORITY_LOWEST)
                 filter->setNonRealtime (true);
@@ -1181,7 +1085,7 @@ public:
                 ed->setOpaque (true);
                 ed->setVisible (true);
 
-                editorComp = new EditorCompWrapper (this, ed);
+                editorComp = new EditorCompWrapper (*this, ed);
             }
             else
             {
@@ -1262,7 +1166,7 @@ public:
                 editorComp->setOpaque (true);
                 editorComp->setVisible (false);
 
-#if JUCE_WIN32
+              #if JUCE_WINDOWS
                 editorComp->addToDesktop (0);
                 hostWindow = (HWND) ptr;
                 HWND editorWnd = (HWND) editorComp->getWindowHandle();
@@ -1271,14 +1175,14 @@ public:
                 DWORD val = GetWindowLong (editorWnd, GWL_STYLE);
                 val = (val & ~WS_POPUP) | WS_CHILD;
                 SetWindowLong (editorWnd, GWL_STYLE, val);
-#elif JUCE_LINUX
+              #elif JUCE_LINUX
                 editorComp->addToDesktop (0);
                 hostWindow = (Window) ptr;
                 Window editorWnd = (Window) editorComp->getWindowHandle();
                 XReparentWindow (display, editorWnd, hostWindow, 0, 0);
-#else
+              #else
                 hostWindow = attachComponentToWindowRef (editorComp, (WindowRef) ptr);
-#endif
+              #endif
                 editorComp->setVisible (true);
 
                 return 1;
@@ -1397,6 +1301,117 @@ public:
         }
     }
 
+    static PluginHostType& getHostType()
+    {
+        static PluginHostType hostType;
+        return hostType;
+    }
+
+    //==============================================================================
+    // A component to hold the AudioProcessorEditor, and cope with some housekeeping
+    // chores when it changes or repaints.
+    class EditorCompWrapper  : public Component,
+                               public AsyncUpdater
+    {
+    public:
+        EditorCompWrapper (JuceVSTWrapper& wrapper_, AudioProcessorEditor* editor)
+            : wrapper (wrapper_)
+        {
+            setOpaque (true);
+            editor->setOpaque (true);
+
+            setBounds (editor->getBounds());
+            editor->setTopLeftPosition (0, 0);
+            addAndMakeVisible (editor);
+
+          #if JUCE_WIN
+            if (! getHostType().isReceptor())
+                addMouseListener (this, true);
+          #endif
+        }
+
+        ~EditorCompWrapper()
+        {
+            deleteAllChildren();
+        }
+
+        void paint (Graphics& g) {}
+
+        void paintOverChildren (Graphics& g)
+        {
+            // this causes an async call to masterIdle() to help
+            // creaky old DAWs like Nuendo repaint themselves while we're
+            // repainting. Otherwise they just seem to give up and sit there
+            // waiting.
+            triggerAsyncUpdate();
+        }
+
+      #if JUCE_MAC
+        bool keyPressed (const KeyPress& kp)
+        {
+            // If we have an unused keypress, move the key-focus to a host window
+            // and re-inject the event..
+            forwardCurrentKeyEventToHost (this);
+            return true;
+        }
+      #endif
+
+        AudioProcessorEditor* getEditorComp() const
+        {
+            return dynamic_cast <AudioProcessorEditor*> (getChildComponent (0));
+        }
+
+        void resized()
+        {
+            Component* const c = getChildComponent (0);
+
+            if (c != 0)
+                c->setBounds (0, 0, getWidth(), getHeight());
+        }
+
+        void childBoundsChanged (Component* child)
+        {
+            child->setTopLeftPosition (0, 0);
+
+            const int cw = child->getWidth();
+            const int ch = child->getHeight();
+
+            wrapper.resizeHostWindow (cw, ch);
+            setSize (cw, ch);
+
+            #if JUCE_MAC
+            wrapper.resizeHostWindow (cw, ch);  // (doing this a second time seems to be necessary in tracktion)
+            #endif
+        }
+
+        void handleAsyncUpdate()
+        {
+            wrapper.tryMasterIdle();
+        }
+
+      #if JUCE_WINDOWS
+        void mouseDown (const MouseEvent&)
+        {
+            broughtToFront();
+        }
+
+        void broughtToFront()
+        {
+            // for hosts like nuendo, need to also pop the MDI container to the
+            // front when our comp is clicked on.
+            HWND parent = findMDIParentOf ((HWND) getWindowHandle());
+
+            if (parent != 0)
+                SetWindowPos (parent, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+        }
+      #endif
+
+        //==============================================================================
+        juce_UseDebuggingNewOperator
+
+    private:
+        JuceVSTWrapper& wrapper;
+    };
 
     //==============================================================================
     juce_UseDebuggingNewOperator
@@ -1421,12 +1436,6 @@ private:
     bool shouldDeleteEditor;
 
     //==============================================================================
-    static PluginHostType& getHostType()
-    {
-        static PluginHostType hostType;
-        return hostType;
-    }
-
 #if JUCE_WINDOWS   // Workarounds for Wavelab's happy-go-lucky use of threads.
     class NonWavelabMMLock
     {
@@ -1479,27 +1488,6 @@ private:
 #endif
 };
 
-//==============================================================================
-void EditorCompWrapper::childBoundsChanged (Component* child)
-{
-    child->setTopLeftPosition (0, 0);
-
-    const int cw = child->getWidth();
-    const int ch = child->getHeight();
-
-    wrapper->resizeHostWindow (cw, ch);
-    setSize (cw, ch);
-
-#if JUCE_MAC
-    wrapper->resizeHostWindow (cw, ch);  // (doing this a second time seems to be necessary in tracktion)
-#endif
-}
-
-void EditorCompWrapper::handleAsyncUpdate()
-{
-    wrapper->tryMasterIdle();
-}
-
 //==============================================================================
 /** Somewhere in the codebase of your plugin, you need to implement this function
     and make it create an instance of the filter subclass that you're building.

extras/audio plugins/wrapper/juce_PluginHostType.h

@@ -57,7 +57,8 @@ public:
         SteinbergCubaseGeneric,
         SteinbergWavelab5,
         SteinbergWavelab6,
-        SteinbergWavelabGeneric
+        SteinbergWavelabGeneric,
+        MuseReceptorGeneric
     };
 
     const HostType type;
@@ -93,6 +94,11 @@ public:
         return type == SteinbergWavelabGeneric || type == SteinbergWavelab5 || type == SteinbergWavelab6;
     }
 
+    bool isReceptor() const throw()
+    {
+        return type == MuseReceptorGeneric;
+    }
+
     //==============================================================================
 private:
     static HostType getHostType() throw()
@@ -128,6 +134,8 @@ private:
         if (hostFilename.containsIgnoreCase ("Wavelab"))    return SteinbergWavelabGeneric;
         if (hostFilename.containsIgnoreCase ("reaper"))     return Reaper;
         if (hostFilename.containsIgnoreCase ("Logic"))      return EmagicLogic;
+        if (hostFilename.containsIgnoreCase ("rm-host"))    return MuseReceptorGeneric;
+
 
 #elif JUCE_LINUX
         jassertfalse   // not yet done!

extras/juce demo/Source/MainDemoWindow.cpp

@@ -495,7 +495,7 @@ public:
 };
 
 //==============================================================================
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
 
 // Just add a simple icon to the Window system tray area..
 class DemoTaskbarComponent  : public SystemTrayIconComponent
@@ -569,14 +569,14 @@ MainDemoWindow::MainDemoWindow()
 
     setVisible (true);
 
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
     taskbarIcon = new DemoTaskbarComponent();
 #endif
 }
 
 MainDemoWindow::~MainDemoWindow()
 {
-#if JUCE_WIN32 || JUCE_LINUX
+#if JUCE_WINDOWS || JUCE_LINUX
     deleteAndZero (taskbarIcon);
 #endif
 

juce_amalgamated.cpp

@@ -86951,6 +86951,9 @@ DrawableText::DrawableText()
 	: colour (Colours::black),
 	  justification (Justification::centredLeft)
 {
+	setBoundingBox (RelativeParallelogram (RelativePoint (0.0f, 0.0f),
+										   RelativePoint (50.0f, 0.0f),
+										   RelativePoint (0.0f, 20.0f)));
 	setFont (Font (15.0f), true);
 }
 

src/gui/graphics/drawables/juce_DrawableText.cpp

@@ -36,6 +36,9 @@ DrawableText::DrawableText()
     : colour (Colours::black),
       justification (Justification::centredLeft)
 {
+    setBoundingBox (RelativeParallelogram (RelativePoint (0.0f, 0.0f),
+                                           RelativePoint (50.0f, 0.0f),
+                                           RelativePoint (0.0f, 20.0f)));
     setFont (Font (15.0f), true);
 }
 

src/juce_DefineMacros.h

@@ -53,7 +53,7 @@
   #endif
 
   // "Rectangle" is defined in some of the newer windows header files..
-  #if JUCE_WIN32
+  #if JUCE_WINDOWS
     #define Rectangle       JUCE_NAMESPACE::Rectangle
   #endif
 #endif