Fixed compilation for !wxUSE_IMAGE as well as !wxUSE_TOOLBAR.

[wxWidgets.git] / src / msw / nativdlg.cpp

diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp
index ed6efcdd49829699b3212819875dde91fdd4e461..519176b336ca6a310567111baa1c08c4272a19cb 100644 (file)
--- a/src/msw/nativdlg.cpp
+++ b/src/msw/nativdlg.cpp
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation
 #endif
 
     #pragma implementation
 #endif
 


@@ -74,15 +74,14 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, wxWindowID& id)
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 

-    wxWindow* child = NULL;

     if (hWndNext)
     if (hWndNext)

-        child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);

 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (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;


@@ -112,15 +111,14 @@ bool wxWindow::LoadNativeDialog(wxWindow* parent, const wxString& name)
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 
     HWND hWndNext;
     hWndNext = ::GetWindow((HWND) m_hWnd, GW_CHILD);
 

-    wxWindow* child = NULL;

     if (hWndNext)
     if (hWndNext)

-        child = CreateWindowFromHWND(this, (WXHWND) hWndNext);
+        CreateWindowFromHWND(this, (WXHWND) hWndNext);

 
     while (hWndNext != (HWND) NULL)
     {
         hWndNext = ::GetWindow(hWndNext, GW_HWNDNEXT);
         if (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;


@@ -187,25 +185,32 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     if (str == wxT("BUTTON"))
     {
         int style1 = (style & 0xFF);
     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;
         }
         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;
         }
         {
             win = new wxRadioButton;
         }

+        else
+#endif

 #if wxUSE_BMPBUTTON
 #if defined(__WIN32__) && defined(BS_BITMAP)
 #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."));
         }
         {
             // TODO: how to find the bitmap?
             win = new wxBitmapButton;
             wxLogError(wxT("Have not yet implemented bitmap button as BS_BITMAP button."));
         }

+        else

 #endif
 #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.
         {
             // TODO: how to find the bitmap?
             // TODO: can't distinguish between bitmap button and bitmap static.


@@ -215,25 +220,34 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
             // with a switch in the drawing code. Call default proc if BS_BITMAP.
             win = new wxBitmapButton;
         }
             // with a switch in the drawing code. Call default proc if BS_BITMAP.
             win = new wxBitmapButton;
         }

+        else

 #endif
 #endif

-        else if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))
+#if wxUSE_BUTTON
+        if ((style1 == BS_PUSHBUTTON) || (style1 == BS_DEFPUSHBUTTON))

         {
             win = new wxButton;
         }
         {
             win = new wxButton;
         }

-        else if (style1 == BS_GROUPBOX)
+        else
+#endif
+#if wxUSE_STATBOX
+        if (style1 == BS_GROUPBOX)

         {
             win = new wxStaticBox;
         }
         else
         {
             win = new wxStaticBox;
         }
         else

+#endif

         {
             wxLogError(wxT("Don't know what kind of button this is: id = %ld"),
                        id);
         }
     }
         {
             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;
     }
     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
     // 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


@@ -244,14 +258,19 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
     {
         win = new wxTextCtrl;
     }
     {
         win = new wxTextCtrl;
     }

+#endif
+#if wxUSE_LISTBOX

     else if (str == wxT("LISTBOX"))
     {
         win = new wxListBox;
     }
     else if (str == wxT("LISTBOX"))
     {
         win = new wxListBox;
     }

+#endif
+#if wxUSE_SCROLLBAR

     else if (str == wxT("SCROLLBAR"))
     {
         win = new wxScrollBar;
     }
     else if (str == wxT("SCROLLBAR"))
     {
         win = new wxScrollBar;
     }

+#endif

 #if defined(__WIN95__) && wxUSE_SPINBTN
     else if (str == wxT("MSCTLS_UPDOWN32"))
     {
 #if defined(__WIN95__) && wxUSE_SPINBTN
     else if (str == wxT("MSCTLS_UPDOWN32"))
     {


@@ -265,6 +284,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
         win = new wxSlider;
     }
 #endif // wxUSE_SLIDER
         win = new wxSlider;
     }
 #endif // wxUSE_SLIDER

+#if wxUSE_STATTEXT

     else if (str == wxT("STATIC"))
     {
         int style1 = (style & 0xFF);
     else if (str == wxT("STATIC"))
     {
         int style1 = (style & 0xFF);


@@ -287,6 +307,7 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
 #endif
 #endif /* wxUSE_STATBMP */
     }
 #endif
 #endif /* wxUSE_STATBMP */
     }

+#endif

     else
     {
         wxString msg(wxT("Don't know how to convert from Windows class "));
     else
     {
         wxString msg(wxT("Don't know how to convert from Windows class "));