projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more SetAppName/SetVendor in the config classes
[wxWidgets.git]
/
src
/
msw
/
nativdlg.cpp
diff --git
a/src/msw/nativdlg.cpp
b/src/msw/nativdlg.cpp
index f59657cefd21f293b46fa95be77fcf955d5fabf3..a99be6dbf8fc5944df295a47af47833dfd2e7937 100644
(file)
--- a/
src/msw/nativdlg.cpp
+++ b/
src/msw/nativdlg.cpp
@@
-58,7
+58,7
@@
bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
if (hWndNext)
child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
if (hWndNext)
child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
- while (hWndNext != NULL)
+ while (hWndNext !=
(HWND)
NULL)
{
hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
if (hWndNext)
{
hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
if (hWndNext)
@@
-139,9
+139,13
@@
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
#else
#ifdef UNICODE
GetClassNameW((HWND) hWnd, buf, 256);
#else
#ifdef UNICODE
GetClassNameW((HWND) hWnd, buf, 256);
+#else
+#ifdef __TWIN32__
+ GetClassName((HWND) hWnd, buf, 256);
#else
GetClassNameA((HWND) hWnd, buf, 256);
#endif
#else
GetClassNameA((HWND) hWnd, buf, 256);
#endif
+#endif
#endif
wxString str(buf);
#endif
wxString str(buf);
@@
-169,7
+173,7
@@
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
{
win = new wxRadioButton;
}
{
win = new wxRadioButton;
}
-#if
def __WIN32__
+#if
defined(__WIN32__) && defined(BS_BITMAP)
else if (style & BS_BITMAP)
{
// TODO: how to find the bitmap?
else if (style & BS_BITMAP)
{
// TODO: how to find the bitmap?
@@
-224,7
+228,7
@@
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
{
win = new wxScrollBar;
}
{
win = new wxScrollBar;
}
-#if defined(__WIN95__)
+#if defined(__WIN95__)
&& !defined(__TWIN32__)
else if (str == "MSCTLS_UPDOWN32")
{
win = new wxSpinButton;
else if (str == "MSCTLS_UPDOWN32")
{
win = new wxSpinButton;
@@
-241,7
+245,7
@@
wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
if ((style1 == SS_LEFT) || (style1 == SS_RIGHT) || (style1 == SS_SIMPLE))
win = new wxStaticText;
if ((style1 == SS_LEFT) || (style1 == SS_RIGHT) || (style1 == SS_SIMPLE))
win = new wxStaticText;
-#if
def __WIN32__
+#if
defined(__WIN32__) && defined(BS_BITMAP)
else if (style1 == SS_BITMAP)
{
win = new wxStaticBitmap;
else if (style1 == SS_BITMAP)
{
win = new wxStaticBitmap;