/////////////////////////////////////////////////////////////////////////////
-// Name: nativdlg.cpp
+// Name: src/msw/nativdlg.cpp
// Purpose: Native dialog loading code (part of wxWindow)
// Author: Julian Smart
// Modified by:
// headers
// ---------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include "wx/wx.h"
#endif
-#if defined(__WIN95__) && !defined(__TWIN32__)
#include "wx/spinbutt.h"
-#endif
#include "wx/msw/private.h"
// ---------------------------------------------------------------------------
(DLGPROC) wxDlgProc);
if ( !m_hWnd )
- return FALSE;
+ return false;
SubclassWin(GetHWND());
HWND hWndNext;
hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
- wxWindow* child = NULL;
if (hWndNext)
- child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+ CreateWindowFromHWND(this, (WXHWND) hWndNext);
while (hWndNext != (HWND) NULL)
{
hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
if (hWndNext)
- child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+ CreateWindowFromHWND(this, (WXHWND) hWndNext);
}
- return TRUE;
+ return true;
}
bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
(DLGPROC)wxDlgProc);
if ( !m_hWnd )
- return FALSE;
+ return false;
SubclassWin(GetHWND());
else
wxTopLevelWindows.Append(this);
- // FIXME why don't we enum all children here?
+ // Enumerate all children
+ HWND hWndNext;
+ hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
+
+ if (hWndNext)
+ CreateWindowFromHWND(this, (WXHWND) hWndNext);
+
+ while (hWndNext != (HWND) NULL)
+ {
+ hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
+ if (hWndNext)
+ CreateWindowFromHWND(this, (WXHWND) hWndNext);
+ }
- return TRUE;
+ return true;
}
// ---------------------------------------------------------------------------
if ( m_windowId == id )
return this;
- wxWindowList::Node *node = GetChildren().GetFirst();
+ wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
while ( node )
{
wxWindow* child = node->GetData();
wxWindow* win = GetWindowChild1(id);
if ( !win )
{
- HWND hWnd = ::GetDlgItem((HWND) GetHWND(), id);
-
- if (hWnd)
+ HWND hwnd = ::GetDlgItem(GetHwnd(), id);
+ if ( hwnd )
{
- wxWindow* child = CreateWindowFromHWND(this, (WXHWND) hWnd);
- if (child)
- {
- child->AddChild(this);
- return child;
- }
+ win = CreateWindowFromHWND(this, (WXHWND) hwnd);
}
}
- return NULL;
+ return win;
}
// ---------------------------------------------------------------------------
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
{
+ wxCHECK_MSG( parent, NULL, _T("must have valid parent for a control") );
+
wxString str(wxGetWindowClass(hWnd));
str.UpperCase();
if (str == wxT("BUTTON"))
{
int style1 = (style & 0xFF);
+#if wxUSE_CHECKBOX
if ((style1 == BS_3STATE) || (style1 == BS_AUTO3STATE) || (style1 == BS_AUTOCHECKBOX) ||
(style1 == BS_CHECKBOX))
{
win = new wxCheckBox;
}
- else if ((style1 == BS_AUTORADIOBUTTON) || (style1 == BS_RADIOBUTTON))
+ else
+#endif
+#if wxUSE_RADIOBTN
+ if ((style1 == BS_AUTORADIOBUTTON) || (style1 == BS_RADIOBUTTON))
{
win = new wxRadioButton;
}
+ else
+#endif
#if wxUSE_BMPBUTTON
#if defined(__WIN32__) && defined(BS_BITMAP)
- else if (style & BS_BITMAP)
+ if (style & BS_BITMAP)
{
// TODO: how to find the bitmap?
win = new wxBitmapButton;
wxLogError(wxT("Have not yet implemented bitmap button as BS_BITMAP button."));
}
+ else
#endif
- else if (style1 == BS_OWNERDRAW)
+ if (style1 == BS_OWNERDRAW)
{
// TODO: how to find the bitmap?
// TODO: can't distinguish between bitmap button and bitmap static.
// with a switch in the drawing code. Call default proc if BS_BITMAP.
win = new wxBitmapButton;
}
+ else
#endif
- else if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))
+#if wxUSE_BUTTON
+ if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))
{
win = new wxButton;
}
- else if (style1 == BS_GROUPBOX)
+ else
+#endif
+#if wxUSE_STATBOX
+ if (style1 == BS_GROUPBOX)
{
win = new wxStaticBox;
}
else
+#endif
{
wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
id);
}
}
+#if wxUSE_COMBOBOX
else if (str == wxT("COMBOBOX"))
{
win = new wxComboBox;
}
+#endif
+#if wxUSE_TEXTCTRL
// TODO: Problem if the user creates a multiline - but not rich text - text control,
// since wxWin assumes RichEdit control for this. Should have m_isRichText in
// wxTextCtrl. Also, convert as much of the window style as is necessary
{
win = new wxTextCtrl;
}
+#endif
+#if wxUSE_LISTBOX
else if (str == wxT("LISTBOX"))
{
win = new wxListBox;
}
+#endif
+#if wxUSE_SCROLLBAR
else if (str == wxT("SCROLLBAR"))
{
win = new wxScrollBar;
}
-#if defined(__WIN95__) && !defined(__TWIN32__) && wxUSE_SPINBTN
+#endif
+#if wxUSE_SPINBTN
else if (str == wxT("MSCTLS_UPDOWN32"))
{
win = new wxSpinButton;
win = new wxSlider;
}
#endif // wxUSE_SLIDER
+#if wxUSE_STATTEXT
else if (str == wxT("STATIC"))
{
int style1 = (style & 0xFF);
- if ((style1 == SS_LEFT) || (style1 == SS_RIGHT) || (style1 == SS_SIMPLE))
+ if ((style1 == SS_LEFT) || (style1 == SS_RIGHT)
+#ifndef __WXWINCE__
+ || (style1 == SS_SIMPLE)
+#endif
+ )
win = new wxStaticText;
#if wxUSE_STATBMP
#if defined(__WIN32__) && defined(BS_BITMAP)
wxLogError(wxT("Please make SS_BITMAP statics into owner-draw buttons."));
}
#endif
-#endif /* wxUSE_STATBMP */
+#endif /* wxUSE_STATBMP */
}
+#endif
else
{
wxString msg(wxT("Don't know how to convert from Windows class "));
if (win)
{
parent->AddChild(win);
- win->SetEventHandler(win);
- win->SetHWND(hWnd);
- win->SetId(id);
win->SubclassWin(hWnd);
win->AdoptAttributesFromHWND();
win->SetupColours();
}
// Make sure the window style (etc.) reflects the HWND style (roughly)
-void wxWindow::AdoptAttributesFromHWND(void)
+void wxWindow::AdoptAttributesFromHWND()
{
- HWND hWnd = (HWND) GetHWND();
- long style = GetWindowLong((HWND) hWnd, GWL_STYLE);
+ SetId(wxGetWindowId(m_hWnd));
+
+ long style = GetWindowLong(GetHwnd(), GWL_STYLE);
if (style & WS_VSCROLL)
m_windowStyle |= wxVSCROLL;
if (style & WS_HSCROLL)
m_windowStyle |= wxHSCROLL;
}
-
projects / wxWidgets.git / blobdiff