mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-17 00:44:19 +00:00
Code Activity

VC6 compatibility updates

Browse source
This commit is contained in:
Julian Storer 2009-12-22 20:59:32 +00:00
parent 24a121e4dd
commit a2183daee5
7 changed files with 32 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

56
build/win32/vc6/JUCE.dsp
View file

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "../../../bin/intermediate_win32/static"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
# ADD CPP /nologo /G6 /MT /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# ADD CPP /nologo /G6 /MD /GR /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG"
@ -65,7 +65,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "../../../bin/intermediate_win32/staticdebug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD CPP /nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# ADD CPP /nologo /G6 /MDd /W3 /Gm /GR /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG"
@ -702,42 +702,6 @@ SOURCE=..\..\..\src\events\juce_Timer.h
# Begin Group "graphics"
# PROP Default_Filter ""
# Begin Group "brushes"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_Brush.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_Brush.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_GradientBrush.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_GradientBrush.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_ImageBrush.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_ImageBrush.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_SolidColourBrush.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\brushes\juce_SolidColourBrush.h
# End Source File
# End Group
# Begin Group "colour"
# PROP Default_Filter ""
@ -783,6 +747,14 @@ SOURCE=..\..\..\src\gui\graphics\contexts\juce_EdgeTable.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\contexts\juce_FillType.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\contexts\juce_FillType.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\gui\graphics\contexts\juce_Graphics.cpp
# End Source File
# Begin Source File
@ -2148,6 +2120,14 @@ SOURCE=..\..\..\src\containers\juce_SparseSet.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\containers\juce_ValueTree.cpp
# End Source File
# Begin Source File
SOURCE=..\..\..\src\containers\juce_ValueTree.h
# End Source File
# Begin Source File
SOURCE=..\..\..\src\containers\juce_Variant.cpp
# End Source File
# Begin Source File

8
juce_amalgamated.cpp
View file

@ -5646,7 +5646,7 @@ void OutputStream::writeCompressedInt (int value)
un >>= 8;
}
data[0] = num;
data[0] = (uint8) num;
if (value < 0)
data[0] |= 0x80;
@ -16838,7 +16838,7 @@ bool ValueTree::hasProperty (const var::identifier& name) const throw()
void ValueTree::removeProperty (const var::identifier& name, UndoManager* const undoManager) throw()
{
if (object != 0)
return object->removeProperty (name, undoManager);
object->removeProperty (name, undoManager);
}
void ValueTree::removeAllProperties (UndoManager* const undoManager) throw()
@ -39012,7 +39012,9 @@ void Component::addToDesktop (int styleWanted, void* nativeWindowToAttachTo)
// thread, you'll need to use a MessageManagerLock object to make sure it's thread-safe.
checkMessageManagerIsLocked
if (! isOpaque())
if (isOpaque())
styleWanted &= ~ComponentPeer::windowIsSemiTransparent;
else
styleWanted |= ComponentPeer::windowIsSemiTransparent;
int currentStyleFlags = 0;

2
juce_amalgamated.h
View file

@ -13064,6 +13064,8 @@ private:
XmlElement* createXml() const throw();
};
friend class SharedObject;
typedef ReferenceCountedObjectPtr <SharedObject> SharedObjectPtr;
ReferenceCountedObjectPtr <SharedObject> object;

2
src/containers/juce_ValueTree.cpp
View file

@ -491,7 +491,7 @@ bool ValueTree::hasProperty (const var::identifier& name) const throw()
void ValueTree::removeProperty (const var::identifier& name, UndoManager* const undoManager) throw()
{
if (object != 0)
return object->removeProperty (name, undoManager);
object->removeProperty (name, undoManager);
}
void ValueTree::removeAllProperties (UndoManager* const undoManager) throw()

2
src/containers/juce_ValueTree.h
View file

@ -338,6 +338,8 @@ private:
XmlElement* createXml() const throw();
};
friend class SharedObject;
typedef ReferenceCountedObjectPtr <SharedObject> SharedObjectPtr;
ReferenceCountedObjectPtr <SharedObject> object;

4
src/gui/components/juce_Component.cpp
View file

@ -430,7 +430,9 @@ void Component::addToDesktop (int styleWanted, void* nativeWindowToAttachTo)
// thread, you'll need to use a MessageManagerLock object to make sure it's thread-safe.
checkMessageManagerIsLocked
if (! isOpaque())
if (isOpaque())
styleWanted &= ~ComponentPeer::windowIsSemiTransparent;
else
styleWanted |= ComponentPeer::windowIsSemiTransparent;
int currentStyleFlags = 0;

2
src/io/streams/juce_OutputStream.cpp
View file

@ -119,7 +119,7 @@ void OutputStream::writeCompressedInt (int value)
un >>= 8;
}
data[0] = num;
data[0] = (uint8) num;
if (value < 0)
data[0] |= 0x80;