diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 896e6f18f5..3d9bb5e966 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -127,6 +127,7 @@ class WXDLLEXPORT wxComboControl;
 class WXDLLEXPORT wxPopupComboWindow : public wxPopupTransientWindow
 {
 public:
+    wxPopupComboWindow() { m_combo = NULL; }
     wxPopupComboWindow(wxComboControl *parent);
 
     bool Create(wxComboControl *parent);
diff --git a/src/univ/colschem.cpp b/src/univ/colschem.cpp
index 56ee660153..8e5dd4adee 100644
--- a/src/univ/colschem.cpp
+++ b/src/univ/colschem.cpp
@@ -48,8 +48,6 @@ wxColourScheme::~wxColourScheme()
 {
 }
 
-#ifdef wxHAS_SS_NATIVE
-
 // ----------------------------------------------------------------------------
 // wxSystemSettings
 // ----------------------------------------------------------------------------
@@ -100,5 +98,3 @@ wxColour wxSystemSettings::GetColour(wxSystemColour index)
     return wxTheme::Get()->GetColourScheme()->Get(col);
 }
 
-#endif // wxHAS_SS_NATIVE
-