added InitCommandEventWithItems() and call it from wxChoice and wxComboBox code to...

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

diff --git a/src/msw/gdiobj.cpp b/src/msw/gdiobj.cpp
index 77c3045ad85b9f466228097dbc8f112c3c9bc69b..447c88327bb8ad96c39c27648e743ef3c95d4e31 100644 (file)
--- a/src/msw/gdiobj.cpp
+++ b/src/msw/gdiobj.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gdiobj.cpp
+// Name:        src/msw/gdiobj.cpp

 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxGDIObject class
 // Author:      Julian Smart
 // Modified by:


@@ -9,23 +9,18 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "gdiobj.h"
-#endif
-

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

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/setup.h"
-#include "wx/list.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #include "wx/gdiobj.h"
 #endif
 
 #include "wx/gdiobj.h"


@@ -33,6 +28,8 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxGDIObject, wxObject)
 

+#define M_GDIDATA wx_static_cast(wxGDIRefData*, m_refData)
+

 /*
 void wxGDIObject::IncrementResourceUsage(void)
 {
 /*
 void wxGDIObject::IncrementResourceUsage(void)
 {


@@ -62,4 +59,3 @@ void wxGDIObject::DecrementResourceUsage(void)
 };
 
 */
 };
 
 */

-