mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-26 18:31:29 +00:00
Bug 513162 - Cleanup unused widget code and CID statics. r=vlad.
This commit is contained in:
parent
5299f95cf5
commit
dc417e93d2
@ -131,7 +131,6 @@
|
|||||||
using namespace mozilla;
|
using namespace mozilla;
|
||||||
|
|
||||||
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
|
static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
|
||||||
static NS_DEFINE_CID(kWidgetCID, NS_CHILD_CID);
|
|
||||||
|
|
||||||
// Struct containing cached metrics for box-wrapped frames.
|
// Struct containing cached metrics for box-wrapped frames.
|
||||||
struct nsBoxLayoutMetrics
|
struct nsBoxLayoutMetrics
|
||||||
|
@ -101,9 +101,6 @@
|
|||||||
#include "nsIDocument.h"
|
#include "nsIDocument.h"
|
||||||
#include "nsIURI.h"
|
#include "nsIURI.h"
|
||||||
|
|
||||||
|
|
||||||
static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID);
|
|
||||||
|
|
||||||
//define DEBUG_REDRAW
|
//define DEBUG_REDRAW
|
||||||
|
|
||||||
#define DEBUG_SPRING_SIZE 8
|
#define DEBUG_SPRING_SIZE 8
|
||||||
|
@ -59,8 +59,6 @@
|
|||||||
#include "nsHTMLContainerFrame.h"
|
#include "nsHTMLContainerFrame.h"
|
||||||
#include "nsDisplayList.h"
|
#include "nsDisplayList.h"
|
||||||
|
|
||||||
static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID);
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// NS_NewLeafBoxFrame
|
// NS_NewLeafBoxFrame
|
||||||
//
|
//
|
||||||
|
@ -111,8 +111,6 @@
|
|||||||
#include "nsBidiPresUtils.h"
|
#include "nsBidiPresUtils.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static NS_DEFINE_CID(kWidgetCID, NS_CHILD_CID);
|
|
||||||
|
|
||||||
// Enumeration function that cancels all the image requests in our cache
|
// Enumeration function that cancels all the image requests in our cache
|
||||||
static PLDHashOperator
|
static PLDHashOperator
|
||||||
CancelImageRequest(const nsAString& aKey,
|
CancelImageRequest(const nsAString& aKey,
|
||||||
|
@ -1738,32 +1738,6 @@ NS_METHOD nsWindow::GetClientBounds(nsIntRect &aRect)
|
|||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get the bounds, but don't take into account the client size
|
|
||||||
void nsWindow::GetNonClientBounds(nsIntRect &aRect)
|
|
||||||
{
|
|
||||||
if (mWnd) {
|
|
||||||
RECT r;
|
|
||||||
VERIFY(::GetWindowRect(mWnd, &r));
|
|
||||||
|
|
||||||
// assign size
|
|
||||||
aRect.width = r.right - r.left;
|
|
||||||
aRect.height = r.bottom - r.top;
|
|
||||||
|
|
||||||
// convert coordinates if parent exists
|
|
||||||
HWND parent = ::GetParent(mWnd);
|
|
||||||
if (parent) {
|
|
||||||
RECT pr;
|
|
||||||
VERIFY(::GetWindowRect(parent, &pr));
|
|
||||||
r.left -= pr.left;
|
|
||||||
r.top -= pr.top;
|
|
||||||
}
|
|
||||||
aRect.x = r.left;
|
|
||||||
aRect.y = r.top;
|
|
||||||
} else {
|
|
||||||
aRect.SetRect(0,0,0,0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Like GetBounds, but don't offset by the parent
|
// Like GetBounds, but don't offset by the parent
|
||||||
NS_METHOD nsWindow::GetScreenBounds(nsIntRect &aRect)
|
NS_METHOD nsWindow::GetScreenBounds(nsIntRect &aRect)
|
||||||
{
|
{
|
||||||
|
@ -280,7 +280,6 @@ protected:
|
|||||||
LPARAM lParamToClient(LPARAM lParam);
|
LPARAM lParamToClient(LPARAM lParam);
|
||||||
nsWindow* GetParentWindow(PRBool aIncludeOwner);
|
nsWindow* GetParentWindow(PRBool aIncludeOwner);
|
||||||
virtual void SubclassWindow(BOOL bState);
|
virtual void SubclassWindow(BOOL bState);
|
||||||
void GetNonClientBounds(nsIntRect &aRect);
|
|
||||||
PRBool CanTakeFocus();
|
PRBool CanTakeFocus();
|
||||||
#if !defined(WINCE)
|
#if !defined(WINCE)
|
||||||
static void InitTrackPointHack();
|
static void InitTrackPointHack();
|
||||||
|
Loading…
Reference in New Issue
Block a user