Merge remote-tracking branch 'haiku/master' into package-management
This reverts 8f7f28a7c3 (OpenGL: Upgrade
to
Mesa 9.2).
Conflicts:
build/jam/BuildFeatures
build/jam/HaikuImage
build/jam/OptionalPackages
build/scripts/build_cross_tools_gcc4
src/add-ons/opengl/swpipe/Jamfile
src/apps/diskusage/Jamfile
src/kits/tracker/ContainerWindow.cpp
src/kits/tracker/DeskWindow.cpp
src/kits/tracker/Jamfile
This commit is contained in:
@@ -19,9 +19,6 @@
|
||||
static const float kVMargin = 2.0f;
|
||||
|
||||
|
||||
class BMessageRunner;
|
||||
|
||||
|
||||
class _BMCFilter_ : public BMessageFilter {
|
||||
public:
|
||||
_BMCFilter_(BMenuField* menuField, uint32 what);
|
||||
@@ -49,9 +46,10 @@ public:
|
||||
virtual void AttachedToWindow();
|
||||
virtual void Draw(BRect updateRect);
|
||||
virtual void FrameResized(float width, float height);
|
||||
virtual void MessageReceived(BMessage* msg);
|
||||
virtual void MakeFocus(bool focused = true);
|
||||
virtual void MessageReceived(BMessage* message);
|
||||
virtual void SetMaxContentWidth(float width);
|
||||
virtual void SetEnabled(bool enabled);
|
||||
|
||||
void TogglePopUpMarker(bool show)
|
||||
{ fShowPopUpMarker = show; }
|
||||
@@ -68,7 +66,6 @@ private:
|
||||
|
||||
BMenuField* fMenuField;
|
||||
bool fFixedSize;
|
||||
BMessageRunner* fRunner;
|
||||
bool fShowPopUpMarker;
|
||||
float fPreviousWidth;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user