Browse Source

Fixed a juce_core dependency problem.

tags/2021-05-28
jules 13 years ago
parent
commit
7d8d4b9627
4 changed files with 10 additions and 10 deletions
  1. +2
    -2
      modules/juce_core/native/juce_linux_Files.cpp
  2. +2
    -2
      modules/juce_core/native/juce_mac_Files.mm
  3. +2
    -2
      modules/juce_gui_basics/application/juce_Application.cpp
  4. +4
    -4
      modules/juce_gui_basics/menus/juce_PopupMenu.cpp

+ 2
- 2
modules/juce_core/native/juce_linux_Files.cpp View File

@@ -129,8 +129,8 @@ File File::getLinkedTarget() const
} }
//============================================================================== //==============================================================================
extern const char** juce_argv; // declared in juce_Application.cpp
extern int juce_argc;
const char* const* juce_argv = nullptr;
int juce_argc = 0;
File File::getSpecialLocation (const SpecialLocationType type) File File::getSpecialLocation (const SpecialLocationType type)
{ {


+ 2
- 2
modules/juce_core/native/juce_mac_Files.mm View File

@@ -163,8 +163,8 @@ bool File::isHidden() const
} }
//============================================================================== //==============================================================================
extern const char** juce_argv; // declared in juce_Application.cpp
extern int juce_argc;
const char* const* juce_argv = nullptr;
int juce_argc = 0;
File File::getSpecialLocation (const SpecialLocationType type) File File::getSpecialLocation (const SpecialLocationType type)
{ {


+ 2
- 2
modules/juce_gui_basics/application/juce_Application.cpp View File

@@ -225,8 +225,8 @@ int JUCEApplication::main()
extern void initialiseNSApplication(); extern void initialiseNSApplication();
#endif #endif
const char* const* juce_argv = nullptr;
int juce_argc = 0;
extern const char** juce_argv; // declared in juce_core
extern int juce_argc;
StringArray JUCEApplication::getCommandLineParameterArray() StringArray JUCEApplication::getCommandLineParameterArray()
{ {


+ 4
- 4
modules/juce_gui_basics/menus/juce_PopupMenu.cpp View File

@@ -394,7 +394,7 @@ public:
Component::SafePointer<Window> parentWindow (owner); Component::SafePointer<Window> parentWindow (owner);
PopupMenu::ItemComponent* currentChildOfParent = parentWindow->currentChild; PopupMenu::ItemComponent* currentChildOfParent = parentWindow->currentChild;
hide (0, true);
hide (nullptr, true);
if (parentWindow != nullptr) if (parentWindow != nullptr)
parentWindow->setCurrentlyHighlightedChild (currentChildOfParent); parentWindow->setCurrentlyHighlightedChild (currentChildOfParent);
@@ -520,7 +520,7 @@ public:
} }
if (hideOnExit && hasBeenOver && ! isOverAny) if (hideOnExit && hasBeenOver && ! isOverAny)
hide (0, true);
hide (nullptr, true);
else else
checkButtonState (localMousePos, timeNow, wasDown, overScrollArea, isOverAny); checkButtonState (localMousePos, timeNow, wasDown, overScrollArea, isOverAny);
} }
@@ -999,7 +999,7 @@ private:
&& (isOver || (activeSubMenu == nullptr) || ! activeSubMenu->isVisible())) && (isOver || (activeSubMenu == nullptr) || ! activeSubMenu->isVisible()))
{ {
if (isOver && (c != nullptr) && (activeSubMenu != nullptr)) if (isOver && (c != nullptr) && (activeSubMenu != nullptr))
activeSubMenu->hide (0, true);
activeSubMenu->hide (nullptr, true);
if (! isOver) if (! isOver)
itemUnderMouse = nullptr; itemUnderMouse = nullptr;
@@ -1413,7 +1413,7 @@ public:
PopupMenuCompletionCallback() PopupMenuCompletionCallback()
: managerOfChosenCommand (nullptr), : managerOfChosenCommand (nullptr),
prevFocused (Component::getCurrentlyFocusedComponent()), prevFocused (Component::getCurrentlyFocusedComponent()),
prevTopLevel (prevFocused != nullptr ? prevFocused->getTopLevelComponent() : 0)
prevTopLevel (prevFocused != nullptr ? prevFocused->getTopLevelComponent() : nullptr)
{ {
PopupMenuSettings::menuWasHiddenBecauseOfAppChange = false; PopupMenuSettings::menuWasHiddenBecauseOfAppChange = false;
} }


Loading…
Cancel
Save