diff --git a/mozilla/layout/html/forms/src/nsInputFrame.cpp b/mozilla/layout/html/forms/src/nsInputFrame.cpp
index 06c52ad6817..dadbba4e61e 100644
--- a/mozilla/layout/html/forms/src/nsInputFrame.cpp
+++ b/mozilla/layout/html/forms/src/nsInputFrame.cpp
@@ -249,7 +249,7 @@ nsInputFrame::ResizeReflow(nsIPresContext* aPresContext,
parWithView->GetView(parView);
const nsIID& id = GetCID();
- nsInputWidgetData* initData = GetWidgetInitData(); // needs to be deleted
+ nsWidgetInitData* initData = GetWidgetInitData(); // needs to be deleted
// initialize the view as hidden since we don't know the (x,y) until Paint
result = view->Init(viewMan, boundBox, parView, &id, initData,
nsnull, 0, nsnull,
@@ -304,7 +304,7 @@ nsInputFrame::ResizeReflow(nsIPresContext* aPresContext,
return NS_OK;
}
-nsInputWidgetData*
+nsWidgetInitData*
nsInputFrame::GetWidgetInitData()
{
return nsnull;
diff --git a/mozilla/layout/html/forms/src/nsInputFrame.h b/mozilla/layout/html/forms/src/nsInputFrame.h
index 63d61a48d68..3d4fa925750 100644
--- a/mozilla/layout/html/forms/src/nsInputFrame.h
+++ b/mozilla/layout/html/forms/src/nsInputFrame.h
@@ -29,13 +29,6 @@ class nsIView;
class nsIPresContext;
class nsStyleCoord;
-struct nsInputWidgetData {
- PRInt32 arg1;
- PRInt32 arg2;
- PRInt32 arg3;
- PRInt32 arg4;
-};
-
/**
* Enumeration of possible mouse states used to detect mouse clicks
*/
@@ -165,7 +158,7 @@ public:
* Perform opertations before the widget associated with this frame has been
* created.
*/
- virtual nsInputWidgetData* GetWidgetInitData();
+ virtual nsWidgetInitData* GetWidgetInitData();
static nscoord GetTextSize(nsIPresContext& aContext, nsIFrame* aFrame,
const nsString& aString, nsSize& aSize);
diff --git a/mozilla/layout/html/forms/src/nsInputText.cpp b/mozilla/layout/html/forms/src/nsInputText.cpp
index 8f2f4a0a90c..a40701c9287 100644
--- a/mozilla/layout/html/forms/src/nsInputText.cpp
+++ b/mozilla/layout/html/forms/src/nsInputText.cpp
@@ -39,7 +39,7 @@ public:
nsInputTextFrame(nsIContent* aContent,
nsIFrame* aParentFrame);
- virtual nsInputWidgetData* GetWidgetInitData();
+ virtual nsWidgetInitData* GetWidgetInitData();
virtual void PostCreateWidget(nsIPresContext* aPresContext, nsIView *aView);
@@ -155,17 +155,17 @@ nsInputTextFrame::GetDesiredSize(nsIPresContext* aPresContext,
aDesiredWidgetSize.height = aDesiredLayoutSize.height;
}
-nsInputWidgetData*
+nsWidgetInitData*
nsInputTextFrame::GetWidgetInitData()
{
static NS_DEFINE_IID(kTextIID, NS_ITEXTWIDGET_IID);
- nsInputWidgetData* data = nsnull;
+ nsTextWidgetInitData* data = nsnull;
nsInputText* content;
GetContent((nsIContent *&) content);
if (kInputTextPassword == content->GetTextType()) {
- data = new nsInputWidgetData();
- data->arg1 = 1;
+ data = new nsTextWidgetInitData();
+ data->mIsPassword = PR_TRUE;
}
NS_RELEASE(content);
diff --git a/mozilla/layout/html/forms/src/nsSelect.cpp b/mozilla/layout/html/forms/src/nsSelect.cpp
index 247078b4b74..3b0e41a8d11 100644
--- a/mozilla/layout/html/forms/src/nsSelect.cpp
+++ b/mozilla/layout/html/forms/src/nsSelect.cpp
@@ -48,7 +48,7 @@ class nsSelectFrame : public nsInputFrame {
public:
nsSelectFrame(nsIContent* aContent, nsIFrame* aParentFrame);
- virtual nsInputWidgetData* GetWidgetInitData();
+ virtual nsWidgetInitData* GetWidgetInitData();
virtual void PostCreateWidget(nsIPresContext* aPresContext, nsIView *aView);
@@ -242,15 +242,15 @@ nsSelectFrame::GetDesiredSize(nsIPresContext* aPresContext,
NS_RELEASE(select);
}
-nsInputWidgetData*
+nsWidgetInitData*
nsSelectFrame::GetWidgetInitData()
{
- nsInputWidgetData* data = nsnull;
+ nsListBoxInitData* data = nsnull;
nsSelect* content;
GetContent((nsIContent *&) content);
if (content->IsMultiple()) {
- data = new nsInputWidgetData();
- data->arg1 = 1;
+ data = new nsListBoxInitData();
+ data->mMultiSelect = PR_TRUE;
}
NS_RELEASE(content);
diff --git a/mozilla/view/public/nsIView.h b/mozilla/view/public/nsIView.h
index f829a41e9a3..2565dac061d 100644
--- a/mozilla/view/public/nsIView.h
+++ b/mozilla/view/public/nsIView.h
@@ -90,7 +90,7 @@ public:
const nsRect &aBounds,
nsIView *aParent,
const nsIID *aWindowIID = nsnull,
- void *aWidgetInitData = nsnull,
+ nsWidgetInitData *aWidgetInitData = nsnull,
nsNativeWindow aNative = nsnull,
PRInt32 aZIndex = 0,
const nsViewClip *aClip = nsnull,
diff --git a/mozilla/view/src/nsScrollingView.cpp b/mozilla/view/src/nsScrollingView.cpp
index aea898bff99..67c5cc8aa67 100644
--- a/mozilla/view/src/nsScrollingView.cpp
+++ b/mozilla/view/src/nsScrollingView.cpp
@@ -131,7 +131,7 @@ nsresult nsScrollingView :: Init(nsIViewManager* aManager,
const nsRect &aBounds,
nsIView *aParent,
const nsIID *aWindowIID,
- void *aWidgetInitData,
+ nsWidgetInitData *aWidgetInitData,
nsNativeWindow aNative,
PRInt32 aZIndex,
const nsViewClip *aClip,
diff --git a/mozilla/view/src/nsScrollingView.h b/mozilla/view/src/nsScrollingView.h
index a2d7683d098..5f52f8bcf40 100644
--- a/mozilla/view/src/nsScrollingView.h
+++ b/mozilla/view/src/nsScrollingView.h
@@ -40,7 +40,7 @@ public:
const nsRect &aBounds,
nsIView *aParent,
const nsIID *aWindowIID = nsnull,
- void *aWidgetInitData = nsnull,
+ nsWidgetInitData *aWidgetInitData = nsnull,
nsNativeWindow aNative = nsnull,
PRInt32 aZIndex = 0,
const nsViewClip *aClip = nsnull,
diff --git a/mozilla/view/src/nsView.cpp b/mozilla/view/src/nsView.cpp
index 96a06fce5be..c6fb39f83b5 100644
--- a/mozilla/view/src/nsView.cpp
+++ b/mozilla/view/src/nsView.cpp
@@ -280,7 +280,7 @@ nsresult nsView :: Init(nsIViewManager* aManager,
const nsRect &aBounds,
nsIView *aParent,
const nsCID *aWindowCIID,
- void *aWidgetInitData,
+ nsWidgetInitData *aWidgetInitData,
nsNativeWindow aNative,
PRInt32 aZIndex,
const nsViewClip *aClip,
diff --git a/mozilla/view/src/nsView.h b/mozilla/view/src/nsView.h
index d85d736fb09..66cd822d571 100644
--- a/mozilla/view/src/nsView.h
+++ b/mozilla/view/src/nsView.h
@@ -46,7 +46,7 @@ public:
const nsRect &aBounds,
nsIView *aParent,
const nsCID *aWindowIID = nsnull,
- void *aWidgetInitData = nsnull,
+ nsWidgetInitData *aWidgetInitData = nsnull,
nsNativeWindow aNative = nsnull,
PRInt32 aZIndex = 0,
const nsViewClip *aClip = nsnull,
diff --git a/mozilla/widget/public/nsIComboBox.h b/mozilla/widget/public/nsIComboBox.h
index d39dd1ab5fd..bd56e3a4738 100644
--- a/mozilla/widget/public/nsIComboBox.h
+++ b/mozilla/widget/public/nsIComboBox.h
@@ -26,6 +26,15 @@
#define NS_ICOMBOBOX_IID \
{ 0x961085f6, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } };
+
+/**
+ * Initialize combobox data
+ */
+
+struct nsComboBoxInitData : public nsWidgetInitData {
+ PRUint32 mDropDownHeight; // in pixels
+};
+
/**
* Single selection drop down list. See nsIListWidget for capabilities
*/
@@ -33,6 +42,7 @@
class nsIComboBox : public nsIListWidget {
};
+
#endif // nsIComboBox_h__
diff --git a/mozilla/widget/public/nsIListBox.h b/mozilla/widget/public/nsIListBox.h
index 9944e6a5468..345ec63f4a5 100644
--- a/mozilla/widget/public/nsIListBox.h
+++ b/mozilla/widget/public/nsIListBox.h
@@ -26,6 +26,15 @@
#define NS_ILISTBOX_IID \
{ 0xf8030014, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } };
+
+/**
+ * Initialize list box data
+ */
+
+struct nsListBoxInitData : public nsWidgetInitData {
+ PRBool mMultiSelect;
+};
+
/**
* Single or multi selection list of items.
* Unlike a nsIWidget, The the list widget must automatically clear
diff --git a/mozilla/widget/public/nsITextWidget.h b/mozilla/widget/public/nsITextWidget.h
index 1b9af67d375..712dc311dbf 100644
--- a/mozilla/widget/public/nsITextWidget.h
+++ b/mozilla/widget/public/nsITextWidget.h
@@ -25,6 +25,12 @@
#define NS_ITEXTWIDGET_IID \
{ 0xf8030011, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } };
+
+struct nsTextWidgetInitData : public nsWidgetInitData {
+ PRBool mIsPassword;
+};
+
+
/**
*
* Single line text editor.
diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h
index bf1c8831d79..12dbe1056aa 100644
--- a/mozilla/widget/public/nsIWidget.h
+++ b/mozilla/widget/public/nsIWidget.h
@@ -90,6 +90,14 @@ enum nsCursor { ///(normal cursor, usually rendered as an arrow)
///(can hyper-link, usually rendered as a human hand)
eCursor_hyperlink };
+
+/**
+ * Basic struct for widget initialization data.
+ * @see Create member function of nsIWidget
+ */
+
+struct nsWidgetInitData { };
+
/**
* The base class for all the widgets. It provides the interface for
* all basic and necessary functionality.
@@ -127,7 +135,7 @@ class nsIWidget : public nsISupports {
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit = nsnull,
- void *aInitData = nsnull) = 0;
+ nsWidgetInitData *aInitData = nsnull) = 0;
/**
* Create and initialize a widget with a native window parent
@@ -153,7 +161,7 @@ class nsIWidget : public nsISupports {
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit = nsnull,
- void *aInitData = nsnull) = 0;
+ nsWidgetInitData *aInitData = nsnull) = 0;
/**
* Close and destroy the internal native window.
diff --git a/mozilla/widget/src/windows/nsComboBox.cpp b/mozilla/widget/src/windows/nsComboBox.cpp
index 7bc1fbcf6ca..4e19d11f4e9 100644
--- a/mozilla/widget/src/windows/nsComboBox.cpp
+++ b/mozilla/widget/src/windows/nsComboBox.cpp
@@ -143,6 +143,7 @@ void nsComboBox::Deselect()
nsComboBox::nsComboBox(nsISupports *aOuter) : nsWindow(aOuter)
{
mBackground = NS_RGB(124, 124, 124);
+ mDropDownHeight = 60; // Default to 60 pixels for drop-down list height
}
//-------------------------------------------------------------------------
@@ -227,4 +228,30 @@ DWORD nsComboBox::WindowExStyle()
return WS_EX_CLIENTEDGE;
}
+//-------------------------------------------------------------------------
+//
+// Cache the drop down list height in mDropDownHeight
+//
+//-------------------------------------------------------------------------
+
+void nsComboBox::PreCreateWidget(nsWidgetInitData *aInitData)
+{
+ nsComboBoxInitData* comboData = (nsComboBoxInitData*)aInitData;
+ mDropDownHeight = comboData->mDropDownHeight;
+}
+
+//-------------------------------------------------------------------------
+//
+// Modify the height passed to create and resize to be
+// the combo box drop down list height. (Note: Windows uses
+// the height of the window to specify the drop-down list size,
+// not the height of combobox text area.
+//
+//-------------------------------------------------------------------------
+
+PRInt32 nsComboBox::GetHeight(PRInt32 aProposedHeight)
+{
+ return(mDropDownHeight);
+}
+
diff --git a/mozilla/widget/src/windows/nsComboBox.h b/mozilla/widget/src/windows/nsComboBox.h
index fde425c7c96..65ce6014d6e 100644
--- a/mozilla/widget/src/windows/nsComboBox.h
+++ b/mozilla/widget/src/windows/nsComboBox.h
@@ -57,12 +57,17 @@ public:
PRInt32 GetSelectedIndex();
void SelectItem(PRInt32 aPosition);
void Deselect() ;
+ void PreCreateWidget(nsWidgetInitData *aInitData);
protected:
+ // Modify the height passed to create and resize to be
+ // the combo box drop down list height.
+ PRInt32 GetHeight(PRInt32 aProposedHeight);
LPCTSTR WindowClass();
DWORD WindowStyle();
DWORD WindowExStyle();
+ PRInt32 mDropDownHeight;
};
diff --git a/mozilla/widget/src/windows/nsListBox.cpp b/mozilla/widget/src/windows/nsListBox.cpp
index ac82f13afba..3f978f81b3b 100644
--- a/mozilla/widget/src/windows/nsListBox.cpp
+++ b/mozilla/widget/src/windows/nsListBox.cpp
@@ -35,11 +35,11 @@ void nsListBox::SetMultipleSelection(PRBool aMultipleSelections)
mMultiSelect = aMultipleSelections;
}
-void nsListBox::PreCreateWidget(void *aInitData)
+void nsListBox::PreCreateWidget(nsWidgetInitData *aInitData)
{
if (nsnull != aInitData) {
- nsWidgetInitData* data = (nsWidgetInitData *) aInitData;
- mMultiSelect = (0 == data->arg1) ? PR_FALSE : PR_TRUE;
+ nsListBoxInitData* data = (nsListBoxInitData *) aInitData;
+ mMultiSelect = data->mMultiSelect;
}
}
diff --git a/mozilla/widget/src/windows/nsListBox.h b/mozilla/widget/src/windows/nsListBox.h
index 308d01a0956..96e2693bdd1 100644
--- a/mozilla/widget/src/windows/nsListBox.h
+++ b/mozilla/widget/src/windows/nsListBox.h
@@ -60,7 +60,7 @@ public:
void GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize);
void SelectItem(PRInt32 aPosition);
void Deselect() ;
- virtual void PreCreateWidget(void *aInitData);
+ virtual void PreCreateWidget(nsWidgetInitData *aInitData);
// nsWindow interface
virtual PRBool AutoErase();
diff --git a/mozilla/widget/src/windows/nsTextHelper.cpp b/mozilla/widget/src/windows/nsTextHelper.cpp
index 0521e463993..6da230b5c53 100644
--- a/mozilla/widget/src/windows/nsTextHelper.cpp
+++ b/mozilla/widget/src/windows/nsTextHelper.cpp
@@ -25,11 +25,11 @@
#include
-void nsTextHelper::PreCreateWidget(void *aInitData)
+void nsTextHelper::PreCreateWidget(nsWidgetInitData *aInitData)
{
if (nsnull != aInitData) {
- nsWidgetInitData* data = (nsWidgetInitData *) aInitData;
- mIsPassword = (0 == data->arg1) ? PR_FALSE : PR_TRUE;
+ nsTextWidgetInitData* data = (nsTextWidgetInitData *) aInitData;
+ mIsPassword = data->mIsPassword;
}
}
diff --git a/mozilla/widget/src/windows/nsTextHelper.h b/mozilla/widget/src/windows/nsTextHelper.h
index 6c5c687afeb..98fb9937f6d 100644
--- a/mozilla/widget/src/windows/nsTextHelper.h
+++ b/mozilla/widget/src/windows/nsTextHelper.h
@@ -47,7 +47,7 @@ public:
virtual PRUint32 GetCaretPosition();
virtual LPCTSTR WindowClass();
virtual DWORD WindowStyle();
- virtual void PreCreateWidget(void *aInitData);
+ virtual void PreCreateWidget(nsWidgetInitData *aInitData);
virtual PRBool AutoErase();
protected:
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index b479a333fe8..98228143c15 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -41,6 +41,16 @@ extern HINSTANCE g_hinst;
static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
+//-------------------------------------------------------------------------
+//
+// Default for height modification is to do nothing
+//
+//-------------------------------------------------------------------------
+
+PRInt32 nsWindow::GetHeight(PRInt32 aProposedHeight)
+{
+ return(aProposedHeight);
+}
//-------------------------------------------------------------------------
//
@@ -377,7 +387,7 @@ void nsWindow::Create(nsIWidget *aParent,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit,
- void *aInitData)
+ nsWidgetInitData *aInitData)
{
if (NULL == mToolkit) {
if (NULL != aToolkit) {
@@ -447,7 +457,7 @@ void nsWindow::Create(nsIWidget *aParent,
aRect.x,
aRect.y,
aRect.width,
- aRect.height,
+ GetHeight(aRect.height),
(aParent) ? (HWND)aParent->GetNativeData(NS_NATIVE_WINDOW):
(HWND)NULL,
NULL,
@@ -480,7 +490,7 @@ void nsWindow::Create(nsNativeWindow aParent,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit,
- void *aInitData)
+ nsWidgetInitData *aInitData)
{
if (NULL == mToolkit) {
@@ -544,7 +554,7 @@ void nsWindow::Create(nsNativeWindow aParent,
aRect.x,
aRect.y,
aRect.width,
- aRect.height,
+ GetHeight(aRect.height),
aParent,
NULL,
nsToolkit::mDllInstance,
@@ -734,11 +744,11 @@ void nsWindow::Resize(PRUint32 aWidth, PRUint32 aHeight)
}
if (NULL != deferrer) {
- VERIFY(::DeferWindowPos(deferrer, mWnd, NULL, 0, 0, aWidth, aHeight,
+ VERIFY(::DeferWindowPos(deferrer, mWnd, NULL, 0, 0, aWidth, GetHeight(aHeight),
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE));
}
else {
- VERIFY(::SetWindowPos(mWnd, NULL, 0, 0, aWidth, aHeight,
+ VERIFY(::SetWindowPos(mWnd, NULL, 0, 0, aWidth, GetHeight(aHeight),
SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOMOVE));
}
}
@@ -762,11 +772,11 @@ void nsWindow::Resize(PRUint32 aX, PRUint32 aY, PRUint32 aWidth, PRUint32 aHeigh
}
if (NULL != deferrer) {
- VERIFY(::DeferWindowPos(deferrer, mWnd, NULL, aX, aY, aWidth, aHeight,
+ VERIFY(::DeferWindowPos(deferrer, mWnd, NULL, aX, aY, aWidth, GetHeight(aHeight),
SWP_NOZORDER | SWP_NOACTIVATE));
}
else {
- VERIFY(::SetWindowPos(mWnd, NULL, aX, aY, aWidth, aHeight,
+ VERIFY(::SetWindowPos(mWnd, NULL, aX, aY, aWidth, GetHeight(aHeight),
SWP_NOZORDER | SWP_NOACTIVATE));
}
}
@@ -1165,7 +1175,7 @@ BOOL nsWindow::CallMethod(MethodInfo *info)
(EVENT_CALLBACK)(info->args[2]),
(nsIDeviceContext*)(info->args[3]),
(nsIToolkit*)(info->args[4]),
- (void*)(info->args[5]));
+ (nsWidgetInitData*)(info->args[5]));
break;
case nsWindow::CREATE_NATIVE:
@@ -1175,7 +1185,7 @@ BOOL nsWindow::CallMethod(MethodInfo *info)
(EVENT_CALLBACK)(info->args[2]),
(nsIDeviceContext*)(info->args[3]),
(nsIToolkit*)(info->args[4]),
- (void*)(info->args[5]));
+ (nsWidgetInitData*)(info->args[5]));
return TRUE;
case nsWindow::DESTROY:
diff --git a/mozilla/widget/src/windows/nsWindow.h b/mozilla/widget/src/windows/nsWindow.h
index 56008c3a1f4..79822921410 100644
--- a/mozilla/widget/src/windows/nsWindow.h
+++ b/mozilla/widget/src/windows/nsWindow.h
@@ -35,15 +35,6 @@
#define NSRGB_2_COLOREF(color) \
RGB(NS_GET_R(color),NS_GET_G(color),NS_GET_B(color))
-
-// data passed in and used before the widget's create method is called
-struct nsWidgetInitData {
- DWORD arg1;
- DWORD arg2;
- DWORD arg3;
- DWORD arg4;
-};
-
/**
* Native WIN32 window wrapper.
*/
@@ -62,20 +53,20 @@ public:
virtual nsresult QueryObject(const nsIID& aIID, void** aInstancePtr);
- virtual void PreCreateWidget(void *aWidgetInitData) {}
+ virtual void PreCreateWidget(nsWidgetInitData *aWidgetInitData) {}
// nsIWidget interface
virtual void Create(nsIWidget *aParent,
const nsRect &aRect,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit = nsnull,
- void *aInitData = nsnull);
+ nsWidgetInitData *aInitData = nsnull);
virtual void Create(nsNativeWindow aParent,
const nsRect &aRect,
EVENT_CALLBACK aHandleEventFunction,
nsIDeviceContext *aContext,
nsIToolkit *aToolkit = nsnull,
- void *aInitData = nsnull);
+ nsWidgetInitData *aInitData = nsnull);
virtual void Destroy();
virtual nsIWidget* GetParent(void);
virtual nsIEnumerator* GetChildren();
@@ -132,6 +123,9 @@ protected:
virtual PRBool ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *aRetValue);
+ // Allow Derived classes to modify the height that is passed
+ // when the window is created or resized.
+ virtual PRInt32 GetHeight(PRInt32 aProposedHeight);
virtual LPCTSTR WindowClass();
virtual DWORD WindowStyle();
virtual DWORD WindowExStyle();
@@ -247,7 +241,7 @@ protected:
EVENT_CALLBACK aHandleEventFunction, \
nsIDeviceContext *aContext, \
nsIToolkit *aToolkit = nsnull, \
- void *aInitData = nsnull) \
+ nsWidgetInitData *aInitData = nsnull) \
{ \
nsWindow::Create(aParent, aRect, aHandleEventFunction, aContext, aToolkit, aInitData); \
} \
@@ -258,7 +252,7 @@ protected:
EVENT_CALLBACK aHandleEventFunction, \
nsIDeviceContext *aContext, \
nsIToolkit *aToolkit = nsnull, \
- void *aInitData = nsnull) \
+ nsWidgetInitData *aInitData = nsnull) \
{ \
nsWindow::Create(aParent, aRect, aHandleEventFunction, aContext, aToolkit, aInitData); \
} \