[ShareDaemon-CVS] ui-wx/src MBitmapButton.cpp,1.14,1.15 defines.h,1.48,1.49

[<ma...@us...>]

Update of /cvsroot/sharedaemon/ui-wx/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22191

Modified Files:
	MBitmapButton.cpp defines.h 
Log Message:
Win32 compile fixes.

Index: MBitmapButton.cpp
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/MBitmapButton.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- MBitmapButton.cpp	22 Feb 2004 23:54:37 -0000	1.14
+++ MBitmapButton.cpp	23 Feb 2004 02:13:53 -0000	1.15
@@ -30,14 +30,15 @@
 
 #include "MBitmapButton.h"
 
-#include <wx/dcmemory.h>
-#include <wx/settings.h>
-
 /**
  * wxMac and wxMSW buttons can have children, use wxButton as base and put
  * a static bitmap in there.
  */
 #if defined(__WXMSW__) || defined(__WXMAC__)
+#include <wx/sizer.h>
+#include <wx/statbmp.h>
+#include <wx/stattext.h>
+
 BEGIN_EVENT_TABLE(MBitmapButton, wxButton)
 	EVT_BUTTON(-1, MBitmapButton::OnClick)
 END_EVENT_TABLE()
@@ -95,6 +96,8 @@
 
 /* Other (GTK) buttons can't breed, thus we do it in wxBitmapButton */
 #else
+#include <wx/dcmemory.h>
+#include <wx/settings.h>
 
 IMPLEMENT_DYNAMIC_CLASS(MBitmapButton, wxBitmapButton)
 

Index: defines.h
===================================================================
RCS file: /cvsroot/sharedaemon/ui-wx/src/defines.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- defines.h	14 Jan 2004 13:02:24 -0000	1.48
+++ defines.h	23 Feb 2004 02:13:53 -0000	1.49
@@ -31,7 +31,6 @@
 #include <wx/taskbar.h>
 
 /* Some defines to make accessing dialog controls easier */
-#define GetDlgItem(X) ((wxTextCtrl*)FindWindowById(X)) 
 #define m_logbook ((wxNotebook*)FindWindowById(ID_LOGBOOK))
 #define prefs_ctrl ((wxListCtrl*)FindWindowById(ID_PREFSCTRL))
 #define prefs_panel ((wxPanel*)FindWindowById(ID_PREFSPANEL))