non-pch build fix

[wxWidgets.git] / src / generic / combog.cpp

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index edf2bba3d6300af0c8bad08efa2d6661d2a14121..d99937a3feb499503d9d10fb7f16b92372a24434 100644 (file)
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        combog.cpp
-// Purpose:     Generic wxComboControl
+// Name:        src/generic/combog.cpp
+// Purpose:     Generic wxComboCtrl

 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006
 // Author:      Jaakko Salli
 // Modified by:
 // Created:     Apr-30-2006


@@ -23,7 +23,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_COMBOCONTROL
+#if wxUSE_COMBOCTRL
+
+#include "wx/combo.h"

 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"


@@ -34,9 +36,6 @@
 
 #include "wx/dcbuffer.h"
 
 
 #include "wx/dcbuffer.h"
 

-#include "wx/combo.h"
-
-

 // ----------------------------------------------------------------------------
 // Some constant adjustments to make the generic more bearable
 
 // ----------------------------------------------------------------------------
 // Some constant adjustments to make the generic more bearable
 


@@ -90,13 +89,13 @@
 // wxGenericComboControl
 // ----------------------------------------------------------------------------
 
 // wxGenericComboControl
 // ----------------------------------------------------------------------------
 

-BEGIN_EVENT_TABLE(wxGenericComboControl, wxComboControlBase)
+BEGIN_EVENT_TABLE(wxGenericComboControl, wxComboCtrlBase)

     EVT_PAINT(wxGenericComboControl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxGenericComboControl::OnMouseEvent)
 END_EVENT_TABLE()
 
 
     EVT_PAINT(wxGenericComboControl::OnPaintEvent)
     EVT_MOUSE_EVENTS(wxGenericComboControl::OnMouseEvent)
 END_EVENT_TABLE()
 
 

-IMPLEMENT_DYNAMIC_CLASS(wxGenericComboControl, wxComboControlBase)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericComboControl, wxComboCtrlBase)

 
 void wxGenericComboControl::Init()
 {
 
 void wxGenericComboControl::Init()
 {


@@ -148,7 +147,7 @@ bool wxGenericComboControl::Create(wxWindow *parent,
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
     // create main window
         m_iFlags |= wxCC_POPUP_ON_MOUSE_UP;
 
     // create main window

-    if ( !wxComboControlBase::Create(parent,
+    if ( !wxComboCtrlBase::Create(parent,

                                      id,
                                      value,
                                      wxDefaultPosition,
                                      id,
                                      value,
                                      wxDefaultPosition,


@@ -363,12 +362,12 @@ bool wxGenericComboControl::PerformAction(const wxControlAction& action,
 
 #endif // __WXUNIVERSAL__
 
 
 #endif // __WXUNIVERSAL__
 

-// If native wxComboControl was not defined, then prepare a simple
+// If native wxComboCtrl was not defined, then prepare a simple

 // front-end so that wxRTTI works as expected.
 #ifndef _WX_COMBOCONTROL_H_
 // front-end so that wxRTTI works as expected.
 #ifndef _WX_COMBOCONTROL_H_

-IMPLEMENT_DYNAMIC_CLASS(wxComboControl, wxGenericComboControl)
+IMPLEMENT_DYNAMIC_CLASS(wxComboCtrl, wxGenericComboControl)

 #endif
 
 #endif // !wxCOMBOCONTROL_FULLY_FEATURED
 
 #endif
 
 #endif // !wxCOMBOCONTROL_FULLY_FEATURED
 

-#endif // wxUSE_COMBOCONTROL
+#endif // wxUSE_COMBOCTRL