1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports

[wxWidgets.git] / src / common / dpycmn.cpp

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index bc39bced676711599c60c0399797ead4ed364954..f5d398867bb6303c172f48f22cb4a1e73082c307 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "displaybase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,7 +29,7 @@
 #if wxUSE_DISPLAY
 
 #include "wx/arrimpl.cpp"
 #if wxUSE_DISPLAY
 
 #include "wx/arrimpl.cpp"

-WX_DEFINE_OBJARRAY(wxArrayVideoModes);
+WX_DEFINE_OBJARRAY(wxArrayVideoModes)

 
 const wxVideoMode wxDefaultVideoMode;
 
 
 const wxVideoMode wxDefaultVideoMode;
 


@@ -44,7 +40,7 @@ const wxVideoMode wxDefaultVideoMode;
 wxDisplayBase::wxDisplayBase(size_t index)
              : m_index (index)
 {
 wxDisplayBase::wxDisplayBase(size_t index)
              : m_index (index)
 {

-    wxASSERT_MSG( m_index < wxDisplayBase::GetCount(),
+    wxASSERT_MSG( m_index < GetCount(),

                     wxT("An invalid index was passed to wxDisplay") );
 }
 
                     wxT("An invalid index was passed to wxDisplay") );
 }