// global functions
// ---------------------------------------------------------------------------
-extern wxWindow *wxWndHook;
extern LONG APIENTRY _EXPORT wxDlgProc(HWND hWnd, UINT message,
WPARAM wParam, LPARAM lParam);
bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
{
m_windowId = id;
- wxWndHook = this;
+
+ wxWindowCreationHook hook(this);
m_hWnd = (WXHWND)::CreateDialog((HINSTANCE)wxGetInstance(),
MAKEINTRESOURCE(id),
parent ? (HWND)parent->GetHWND() : 0,
(DLGPROC) wxDlgProc);
- wxWndHook = NULL;
if ( !m_hWnd )
return FALSE;
{
SetName(name);
- wxWndHook = this;
+ wxWindowCreationHook hook(this);
m_hWnd = (WXHWND)::CreateDialog((HINSTANCE) wxGetInstance(),
name.c_str(),
parent ? (HWND)parent->GetHWND() : 0,
(DLGPROC)wxDlgProc);
- wxWndHook = NULL;
if ( !m_hWnd )
return FALSE;
wxWindow* win = NULL;
- if (str == T("BUTTON"))
+ if (str == wxT("BUTTON"))
{
int style1 = (style & 0xFF);
if ((style1 == BS_3STATE) || (style1 == BS_AUTO3STATE) || (style1 == BS_AUTOCHECKBOX) ||
{
// TODO: how to find the bitmap?
win = new wxBitmapButton;
- wxLogError(T("Have not yet implemented bitmap button as BS_BITMAP button."));
+ wxLogError(wxT("Have not yet implemented bitmap button as BS_BITMAP button."));
}
#endif
else if (style1 == BS_OWNERDRAW)
}
else
{
- wxLogError(T("Don't know what kind of button this is: id = %d"),
+ wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
id);
}
}
- else if (str == T("COMBOBOX"))
+ else if (str == wxT("COMBOBOX"))
{
win = new wxComboBox;
}
// for correct functioning.
// Could have wxWindow::AdoptAttributesFromHWND(WXHWND)
// to be overridden by each control class.
- else if (str == T("EDIT("))
+ else if (str == wxT("EDIT"))
{
win = new wxTextCtrl;
}
- else if (str == T("LISTBOX"))
+ else if (str == wxT("LISTBOX"))
{
win = new wxListBox;
}
- else if (str == T("SCROLLBAR"))
+ else if (str == wxT("SCROLLBAR"))
{
win = new wxScrollBar;
}
-#if defined(__WIN95__) && !defined(__TWIN32__)
- else if (str == T("MSCTLS_UPDOWN32"))
+#if defined(__WIN95__) && !defined(__TWIN32__) && wxUSE_SPINBTN
+ else if (str == wxT("MSCTLS_UPDOWN32"))
{
win = new wxSpinButton;
}
#endif
- else if (str == T("MSCTLS_TRACKBAR32"))
+#if wxUSE_SLIDER
+ else if (str == wxT("MSCTLS_TRACKBAR32"))
{
// Need to ascertain if it's horiz or vert
win = new wxSlider;
}
- else if (str == T("STATIC"))
+#endif // wxUSE_SLIDER
+ else if (str == wxT("STATIC"))
{
int style1 = (style & 0xFF);
win = new wxStaticBitmap;
// Help! this doesn't correspond with the wxWin implementation.
- wxLogError(T("Please make SS_BITMAP statics into owner-draw buttons."));
+ wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
}
#endif
}
else
{
- wxString msg(T("Don't know how to convert from Windows class "));
+ wxString msg(wxT("Don't know how to convert from Windows class "));
msg += str;
wxLogError(msg);
}
win->SubclassWin(hWnd);
win->AdoptAttributesFromHWND();
win->SetupColours();
-
- return win;
}
- else
- return NULL;
+
+ return win;
}
// Make sure the window style (etc.) reflects the HWND style (roughly)