Fixed various wxMSW compile problems that came down the telephone line...

plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes, doc changes. Sorry about the quantity :-( git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
--- a/include/wx/msw/app.h
+++ b/include/wx/msw/app.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __APPH__
-#define __APPH__
+#ifndef _WX_APP_H_
+#define _WX_APP_H_

 #ifdef __GNUG__
 #pragma interface "app.h"
@@ -162,5 +162,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
 #endif

 #endif
-    // __APPH__
+    // _WX_APP_H_

--- a/include/wx/msw/bitmap.h
+++ b/include/wx/msw/bitmap.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __BITMAPH__
-#define __BITMAPH__
+#ifndef _WX_BITMAP_H_
+#define _WX_BITMAP_H_

 #ifdef __GNUG__
 #pragma interface "bitmap.h"
@@ -199,4 +199,4 @@ public:

 };
 #endif
-  // __BITMAPH__
+  // _WX_BITMAP_H_
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __BMPBUTTNH__
-#define __BMPBUTTNH__
+#ifndef _WX_BMPBUTTN_H_
+#define _WX_BMPBUTTN_H_

 #ifdef __GNUG__
 #pragma interface "bmpbuttn.h"
@@ -82,4 +82,4 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
 };

 #endif
-    // __BMPBUTTNH__
+    // _WX_BMPBUTTN_H_
--- a/include/wx/msw/brush.h
+++ b/include/wx/msw/brush.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __BRUSHH__
-#define __BRUSHH__
+#ifndef _WX_BRUSH_H_
+#define _WX_BRUSH_H_

 #ifdef __GNUG__
 #pragma interface "brush.h"
@@ -81,4 +81,4 @@ public:
 };

 #endif
-    // __BRUSHH__
+    // _WX_BRUSH_H_
--- a/include/wx/msw/button.h
+++ b/include/wx/msw/button.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __BUTTONH__
-#define __BUTTONH__
+#ifndef _WX_BUTTON_H_
+#define _WX_BUTTON_H_

 #ifdef __GNUG__
 #pragma interface "button.h"
@@ -53,4 +53,4 @@ class WXDLLEXPORT wxButton: public wxControl
 };

 #endif
-    // __BUTTONH__
+    // _WX_BUTTON_H_
--- a/include/wx/msw/checkbox.h
+++ b/include/wx/msw/checkbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __CHECKBOXH__
-#define __CHECKBOXH__
+#ifndef _WX_CHECKBOX_H_
+#define _WX_CHECKBOX_H_

 #ifdef __GNUG__
 #pragma interface "checkbox.h"
@@ -81,4 +81,4 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
  virtual void SetLabel(const wxBitmap *bitmap);
 };
 #endif
-    // __CHECKBOXH__
+    // _WX_CHECKBOX_H_
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -6,11 +6,11 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

-#ifndef   __CHECKLST_H__
-#define   __CHECKLST_H__
+#ifndef   __CHECKLST__H_
+#define   __CHECKLST__H_

 #ifdef __GNUG__
 #pragma interface "checklst.h"
--- a/include/wx/msw/choice.h
+++ b/include/wx/msw/choice.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __CHOICEH__
-#define __CHOICEH__
+#ifndef _WX_CHOICE_H_
+#define _WX_CHOICE_H_

 #ifdef __GNUG__
 #pragma interface "choice.h"
@@ -26,9 +26,7 @@ class WXDLLEXPORT wxChoice: public wxControl
  DECLARE_DYNAMIC_CLASS(wxChoice)

 public:
-  int no_strings;
-
-  inline wxChoice(void) { no_strings = 0; }
+  inline wxChoice(void) { m_noStrings = 0; }

  inline wxChoice(wxWindow *parent, wxWindowID id,
           const wxPoint& pos = wxDefaultPosition,
@@ -60,7 +58,7 @@ class WXDLLEXPORT wxChoice: public wxControl
  virtual wxString GetStringSelection(void) const ;
  virtual bool SetStringSelection(const wxString& sel);

-  virtual inline int Number(void) const { return no_strings; }
+  virtual inline int Number(void) const { return m_noStrings; }
  virtual void Command(wxCommandEvent& event);

  virtual bool MSWCommand(WXUINT param, WXWORD id);
@@ -72,7 +70,11 @@ class WXDLLEXPORT wxChoice: public wxControl
 			WXUINT message, WXWPARAM wParam, WXLPARAM lParam);

  long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+  int       m_noStrings;
+
 };

 #endif
-	// __CHOICEH__
+	// _WX_CHOICE_H_
--- a/include/wx/msw/clipbrd.h
+++ b/include/wx/msw/clipbrd.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __CLIPBRDH__
-#define __CLIPBRDH__
+#ifndef _WX_CLIPBRD_H_
+#define _WX_CLIPBRD_H_

 #ifdef __GNUG__
 #pragma interface "clipbrd.h"
@@ -108,4 +108,4 @@ extern wxClipboard* WXDLLEXPORT wxTheClipboard;

 #endif // USE_CLIPBOARD
 #endif
-    // __CLIPBRDH__
+    // _WX_CLIPBRD_H_
--- a/include/wx/msw/colordlg.h
+++ b/include/wx/msw/colordlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __COLORDLGH__
-#define __COLORDLGH__
+#ifndef _WX_COLORDLG_H_
+#define _WX_COLORDLG_H_

 #ifdef __GNUG__
 #pragma interface "colordlg.h"
@@ -26,19 +26,20 @@

 class WXDLLEXPORT wxColourDialog: public wxDialog
 {
- DECLARE_DYNAMIC_CLASS(wxColourDialog)
- protected:
-  wxColourData colourData;
-  wxWindow *dialogParent;
- public:
-  wxColourDialog(void);
-  wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
+DECLARE_DYNAMIC_CLASS(wxColourDialog)
+public:
+    wxColourDialog(void);
+    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);

-  bool Create(wxWindow *parent, wxColourData *data = NULL);
+    bool Create(wxWindow *parent, wxColourData *data = NULL);

-  int ShowModal(void);
-  wxColourData& GetColourData(void) { return colourData; }
+    int ShowModal(void);
+    wxColourData& GetColourData(void) { return m_colourData; }
+
+protected:
+    wxColourData        m_colourData;
+    wxWindow*           m_dialogParent;
 };

 #endif
-    // __COLORDLGH__
+    // _WX_COLORDLG_H_
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __COLOURH__
-#define __COLOURH__
+#ifndef _WX_COLOUR_H_
+#define _WX_COLOUR_H_

 #ifdef __GNUG__
 #pragma interface "colour.h"
@@ -68,4 +68,4 @@ public:
 #define wxColor wxColour

 #endif
-	// __COLOURH__
+	// _WX_COLOUR_H_
--- a/include/wx/msw/combobox.h
+++ b/include/wx/msw/combobox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __COMBOBOXH__
-#define __COMBOBOXH__
+#ifndef _WX_COMBOBOX_H_
+#define _WX_COMBOBOX_H_

 #ifdef __GNUG__
 #pragma interface "combobox.h"
@@ -80,4 +80,4 @@ class WXDLLEXPORT wxComboBox: public wxChoice

 #endif // USE_COMBOBOX
 #endif
-    // __COMBOBOXH__
+    // _WX_COMBOBOX_H_
--- a/include/wx/msw/control.h
+++ b/include/wx/msw/control.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __CONTROLH__
-#define __CONTROLH__
+#ifndef _WX_CONTROL_H_
+#define _WX_CONTROL_H_

 #ifdef __GNUG__
 #pragma interface "control.h"
@@ -83,4 +83,4 @@ inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
 #endif

 #endif
-    // __CONTROLH__
+    // _WX_CONTROL_H_
--- a/include/wx/msw/curico.h
+++ b/include/wx/msw/curico.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 HICON    ReadIconFile(    char *szFileName, HINSTANCE hInst,
--- a/include/wx/msw/cursor.h
+++ b/include/wx/msw/cursor.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __CURSORH__
-#define __CURSORH__
+#ifndef _WX_CURSOR_H_
+#define _WX_CURSOR_H_

 #ifdef __GNUG__
 #pragma interface "cursor.h"
@@ -66,4 +66,4 @@ public:
 };

 #endif
-    // __CURSORH__
+    // _WX_CURSOR_H_
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DCH__
-#define __DCH__
+#ifndef _WX_DC_H_
+#define _WX_DC_H_

 #ifdef __GNUG__
 #pragma interface "dc.h"
@@ -412,4 +412,4 @@ extern int wxPageNumber;


 #endif
-    // __DCH__
+    // _WX_DC_H_
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DCCLIENTH__
-#define __DCCLIENTH__
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_

 #ifdef __GNUG__
 #pragma interface "dcclient.h"
@@ -62,4 +62,4 @@ class WXDLLEXPORT wxPaintDC: public wxDC
 };

 #endif
-    // __DCCLIENTH__
+    // _WX_DCCLIENT_H_
--- a/include/wx/msw/dcmemory.h
+++ b/include/wx/msw/dcmemory.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DCMEMORYH__
-#define __DCMEMORYH__
+#ifndef _WX_DCMEMORY_H_
+#define _WX_DCMEMORY_H_

 #ifdef __GNUG__
 #pragma interface "dcmemory.h"
@@ -32,4 +32,4 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
 };

 #endif
-    // __DCMEMORYH__
+    // _WX_DCMEMORY_H_
--- a/include/wx/msw/dcprint.h
+++ b/include/wx/msw/dcprint.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DCPRINTH__
-#define __DCPRINTH__
+#ifndef _WX_DCPRINT_H_
+#define _WX_DCPRINT_H_

 #ifdef __GNUG__
 #pragma interface "dcprint.h"
@@ -34,5 +34,5 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
 WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);

 #endif
-    // __DCPRINTH__
+    // _WX_DCPRINT_H_

--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DCSCREENH__
-#define __DCSCREENH__
+#ifndef _WX_DCSCREEN_H_
+#define _WX_DCSCREEN_H_

 #ifdef __GNUG__
 #pragma interface "dcscreen.h"
@@ -35,5 +35,5 @@ class WXDLLEXPORT wxScreenDC: public wxDC
 };

 #endif
-    // __DCSCREENH__
+    // _WX_DCSCREEN_H_

--- a/include/wx/msw/dde.h
+++ b/include/wx/msw/dde.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DDEH__
-#define __DDEH__
+#ifndef _WX_DDE_H_
+#define _WX_DDE_H_

 #ifdef __GNUG__
 #pragma interface "dde.h"
@@ -159,4 +159,4 @@ void WXDLLEXPORT wxDDECleanUp();
 #endif

 #endif
-    // __DDEH__
+    // _WX_DDE_H_
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DIALOGH__
-#define __DIALOGH__
+#ifndef _WX_DIALOG_H_
+#define _WX_DIALOG_H_

 #ifdef __GNUG__
 #pragma interface "dialog.h"
@@ -118,4 +118,4 @@ DECLARE_EVENT_TABLE()
 };

 #endif
-    // __DIALOGH__
+    // _WX_DIALOG_H_
--- a/include/wx/msw/dib.h
+++ b/include/wx/msw/dib.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 // Save (device dependent) wxBitmap as a DIB
--- a/include/wx/msw/dibutils.h
+++ b/include/wx/msw/dibutils.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart
-// Licence:   	wxWindows license
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 /***************************************************************************
--- a/include/wx/msw/dirdlg.h
+++ b/include/wx/msw/dirdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __DIRDLGH__
-#define __DIRDLGH__
+#ifndef _WX_DIRDLG_H_
+#define _WX_DIRDLG_H_

 #ifdef __GNUG__
 #pragma interface "dirdlg.h"
@@ -44,4 +44,4 @@ protected:
 };

 #endif
-    // __DIRDLGH__
+    // _WX_DIRDLG_H_
--- a/include/wx/msw/filedlg.h
+++ b/include/wx/msw/filedlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __FILEDLGH__
-#define __FILEDLGH__
+#ifndef _WX_FILEDLG_H_
+#define _WX_FILEDLG_H_

 #ifdef __GNUG__
 #pragma interface "filedlg.h"
@@ -86,4 +86,4 @@ char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, co
 char* WXDLLEXPORT wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);

 #endif
-    // __FILEDLGH__
+    // _WX_FILEDLG_H_
--- a/include/wx/msw/font.h
+++ b/include/wx/msw/font.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __FONTH__
-#define __FONTH__
+#ifndef _WX_FONT_H_
+#define _WX_FONT_H_

 #ifdef __GNUG__
 #pragma interface "font.h"
@@ -95,4 +95,4 @@ public:
 };

 #endif
-    // __FONTH__
+    // _WX_FONT_H_
--- a/include/wx/msw/fontdlg.h
+++ b/include/wx/msw/fontdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __FONTDLGH__
-#define __FONTDLGH__
+#ifndef _WX_FONTDLG_H_
+#define _WX_FONTDLG_H_

 #ifdef __GNUG__
 #pragma interface "fontdlg.h"
@@ -25,20 +25,22 @@
 
 class WXDLLEXPORT wxFontDialog: public wxDialog
 {
- DECLARE_DYNAMIC_CLASS(wxFontDialog)
- protected:
-  wxWindow *dialogParent;
-  wxFontData fontData;
- public:
-  wxFontDialog(void);
-  wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
+DECLARE_DYNAMIC_CLASS(wxFontDialog)

-  bool Create(wxWindow *parent, wxFontData *data = NULL);
+public:
+    wxFontDialog(void);
+    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);

-  int ShowModal(void);
-  wxFontData& GetFontData(void) { return fontData; }
+    bool Create(wxWindow *parent, wxFontData *data = NULL);
+
+    int ShowModal(void);
+    wxFontData& GetFontData(void) { return m_fontData; }
+
+protected:
+    wxWindow *m_dialogParent;
+    wxFontData m_fontData;
 };

 #endif
-    // __FONTDLGH__
+    // _WX_FONTDLG_H_

--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __FRAMEH__
-#define __FRAMEH__
+#ifndef _WX_FRAME_H_
+#define _WX_FRAME_H_

 #ifdef __GNUG__
 #pragma interface "frame.h"
@@ -172,4 +172,4 @@ protected:
 };

 #endif
-    // __FRAMEH__
+    // _WX_FRAME_H_
--- a/include/wx/msw/gauge.h
+++ b/include/wx/msw/gauge.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GAUGEH__
-#define __GAUGEH__
+#ifndef _WX_GAUGE_H_
+#define _WX_GAUGE_H_

 #ifdef __GNUG__
 #pragma interface "gauge.h"
@@ -27,4 +27,4 @@
 #endif

 #endif
-    // __GAUGEH__
+    // _WX_GAUGE_H_
--- a/include/wx/msw/gauge95.h
+++ b/include/wx/msw/gauge95.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _GAUGE95_H_
--- a/include/wx/msw/gaugemsw.h
+++ b/include/wx/msw/gaugemsw.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _GAUGEMSW_H_
--- a/include/wx/msw/gdiobj.h
+++ b/include/wx/msw/gdiobj.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __GDIOBJH__
-#define __GDIOBJH__
+#ifndef _WX_GDIOBJ_H_
+#define _WX_GDIOBJ_H_

 #include "wx/object.h"

@@ -64,4 +64,4 @@ protected:
 };

 #endif
-    // __GDIOBJH__
+    // _WX_GDIOBJ_H_
--- a/include/wx/msw/helpwin.h
+++ b/include/wx/msw/helpwin.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __HELPWINH__
-#define __HELPWINH__
+#ifndef _WX_HELPWIN_H_
+#define _WX_HELPWIN_H_

 #ifdef __GNUG__
 #pragma interface "helpwin.h"
@@ -51,4 +51,4 @@ protected:

 #endif // USE_HELP
 #endif
-    // __HELPWINH__
+    // _WX_HELPWIN_H_
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __ICONH__
-#define __ICONH__
+#ifndef _WX_ICON_H_
+#define _WX_ICON_H_

 #ifdef __GNUG__
 #pragma interface "icon.h"
@@ -99,4 +99,4 @@ public:
 };

 #endif
-    // __ICONH__
+    // _WX_ICON_H_
--- a/include/wx/msw/imaglist.h
+++ b/include/wx/msw/imaglist.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __IMAGLISTH__
-#define __IMAGLISTH__
+#ifndef _WX_IMAGLIST_H_
+#define _WX_IMAGLIST_H_

 #ifdef __GNUG__
 #pragma interface "imaglist.h"
@@ -223,4 +223,4 @@ protected:
 };

 #endif
-    // __IMAGLISTH__
+    // _WX_IMAGLIST_H_
--- a/include/wx/msw/iniconf.h
+++ b/include/wx/msw/iniconf.h
@@ -6,7 +6,7 @@
 // Created:     27.07.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

 #ifndef   _INICONF_H
--- a/include/wx/msw/joystick.h
+++ b/include/wx/msw/joystick.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __JOYSTICKH__
-#define __JOYSTICKH__
+#ifndef _WX_JOYSTICK_H_
+#define _WX_JOYSTICK_H_

 #ifdef __GNUG__
 #pragma interface "joystick.h"
@@ -90,4 +90,4 @@ protected:
 };

 #endif
-    // __JOYSTICKH__
+    // _WX_JOYSTICK_H_
--- a/include/wx/msw/listbox.h
+++ b/include/wx/msw/listbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __LISTBOXH__
-#define __LISTBOXH__
+#ifndef _WX_LISTBOX_H_
+#define _WX_LISTBOX_H_

 #ifdef __GNUG__
 #pragma interface "listbox.h"
@@ -18,7 +18,6 @@

 #include "wx/control.h"

-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
 WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;

 #if USE_OWNER_DRAWN
@@ -134,4 +133,4 @@ class WXDLLEXPORT wxListBox: public wxControl
 };

 #endif
-    // __LISTBOXH__
+    // _WX_LISTBOX_H_
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __LISTCTRLH__
-#define __LISTCTRLH__
+#ifndef _WX_LISTCTRL_H_
+#define _WX_LISTCTRL_H_

 #ifdef __GNUG__
 #pragma interface "listctrl.h"
@@ -225,7 +225,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
  int GetCountPerPage(void) const;

  // Gets the edit control for editing labels.
-  wxTextCtrl& GetEditControl(void) const;
+  wxTextCtrl* GetEditControl(void) const;

  // Gets information about the item
  bool GetItem(wxListItem& info) const ;
@@ -341,8 +341,11 @@ class WXDLLEXPORT wxListCtrl: public wxControl
  // Clears items, and columns if there are any.
  void ClearAll(void);

-  // Edits a label
-  wxTextCtrl& Edit(long item) ;
+  // Edit the label
+  wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+
+  // End label editing, optionally cancelling the edit
+  bool EndEditLabel(bool cancel);

  // Ensures this item is visible
  bool EnsureVisible(long item) ;
@@ -426,7 +429,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
  char *AddPool(const wxString& str);

 protected:
-  wxTextCtrl        m_textCtrl;        // The control used for editing a label
+  wxTextCtrl*       m_textCtrl;        // The control used for editing a label
  wxImageList *     m_imageListNormal; // The image list for normal icons
  wxImageList *     m_imageListSmall;  // The image list for small icons
  wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)
@@ -473,4 +476,4 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
 #define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },

 #endif
-    // __LISTCTRLH__
+    // _WX_LISTCTRL_H_
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __MDIH__
-#define __MDIH__
+#ifndef _WX_MDI_H_
+#define _WX_MDI_H_

 #ifdef __GNUG__
 #pragma interface "mdi.h"
@@ -206,4 +206,4 @@ DECLARE_EVENT_TABLE()
 };

 #endif
-    // __MDIH__
+    // _WX_MDI_H_
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -9,8 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __MENUH__
-#define __MENUH__
+#ifndef _WX_MENU_H_
+#define _WX_MENU_H_

 #ifdef __GNUG__
 #pragma interface "menu.h"
@@ -19,9 +19,9 @@
 #include "wx/defs.h"
 #include "wx/event.h"

-class wxMenuItem;
-class wxMenuBar;
-class wxMenu;
+class WXDLLEXPORT wxMenuItem;
+class WXDLLEXPORT wxMenuBar;
+class WXDLLEXPORT wxMenu;

 WXDLLEXPORT_DATA(extern const char*) wxEmptyString;

@@ -125,7 +125,7 @@ public:
 // ----------------------------------------------------------------------------
 // Menu Bar (a la Windows)
 // ----------------------------------------------------------------------------
-class wxFrame;
+class WXDLLEXPORT wxFrame;
 class WXDLLEXPORT wxMenuBar: public wxEvtHandler
 {
  DECLARE_DYNAMIC_CLASS(wxMenuBar)
@@ -177,4 +177,4 @@ public:
  WXHMENU                   m_hMenu;
 };

-#endif // __MENUH__
+#endif // _WX_MENU_H_
--- a/include/wx/msw/metafile.h
+++ b/include/wx/msw/metafile.h
@@ -5,13 +5,13 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


-#ifndef __METAFIILEH__
-#define __METAFIILEH__
+#ifndef _WX_METAFIILE_H_
+#define _WX_METAFIILE_H_

 #ifdef __GNUG__
 #pragma interface "metafile.h"
@@ -101,4 +101,4 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y

 #endif // USE_METAFILE
 #endif
-    // __METAFIILEH__
+    // _WX_METAFIILE_H_
--- a/include/wx/msw/minifram.h
+++ b/include/wx/msw/minifram.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __MINIFRAMH__
-#define __MINIFRAMH__
+#ifndef _WX_MINIFRAM_H_
+#define _WX_MINIFRAM_H_

 #ifdef __GNUG__
 #pragma interface "minifram.h"
@@ -43,4 +43,4 @@ protected:
 };

 #endif
-    // __MINIFRAMH__
+    // _WX_MINIFRAM_H_
--- a/include/wx/msw/msgdlg.h
+++ b/include/wx/msw/msgdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __MSGBOXDLGH__
-#define __MSGBOXDLGH__
+#ifndef _WX_MSGBOXDLG_H_
+#define _WX_MSGBOXDLG_H_

 #ifdef __GNUG__
 #pragma interface "msgdlg.h"
@@ -46,4 +46,4 @@ int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption =
  wxWindow *parent = NULL, int x = -1, int y = -1);

 #endif
-    // __MSGBOXDLGH__
+    // _WX_MSGBOXDLG_H_
--- a/include/wx/msw/ole/dataobj.h
+++ b/include/wx/msw/ole/dataobj.h
@@ -6,11 +6,11 @@
 // Created:     10.05.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

-#ifndef   _OLEDATAOBJ_H
-#define   _OLEDATAOBJ_H
+#ifndef   _WX_OLEDATAOBJ_H
+#define   _WX_OLEDATAOBJ_H

 // ----------------------------------------------------------------------------
 // forward declarations
@@ -106,4 +106,4 @@ private:
 // @@@ TODO: wx{Bitmap|Metafile|...}DataObject
 // ----------------------------------------------------------------------------

-#endif  //_OLEDATAOBJ_H
+#endif  //_WX_OLEDATAOBJ_H
--- a/include/wx/msw/ole/dropsrc.h
+++ b/include/wx/msw/ole/dropsrc.h
@@ -6,11 +6,11 @@
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

-#ifndef   _OLEDROPSRC_H
-#define   _OLEDROPSRC_H
+#ifndef   _WX_OLEDROPSRC_H
+#define   _WX_OLEDROPSRC_H

 #ifdef __GNUG__
 #pragma interface
@@ -68,4 +68,4 @@ private:
  wxIDropSource *m_pIDropSource;  // the pointer to COM interface
 };

-#endif  //_OLEDROPSRC_H
+#endif  //_WX_OLEDROPSRC_H
--- a/include/wx/msw/ole/droptgt.h
+++ b/include/wx/msw/ole/droptgt.h
@@ -6,14 +6,14 @@
 // Created:     06.03.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

 // ============================================================================
 // prolog
 // ============================================================================
-#ifndef   _OLEDROPTGT_H
-#define   _OLEDROPTGT_H
+#ifndef   _WX_OLEDROPTGT_H
+#define   _WX_OLEDROPTGT_H

 #ifdef __GNUG__
 #pragma interface "droptgt.h"
@@ -108,4 +108,4 @@ protected:
 };

 // ============================================================================
-#endif  //_OLEDROPTGT_H
+#endif  //_WX_OLEDROPTGT_H
--- a/include/wx/msw/ole/oleutils.h
+++ b/include/wx/msw/ole/oleutils.h
@@ -6,11 +6,11 @@
 // Created:     19.02.1998
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

-#ifndef   _OLEUTILS_H
-#define   _OLEUTILS_H
+#ifndef   _WX_OLEUTILS_H
+#define   _WX_OLEUTILS_H

 #ifdef __GNUG__
 #pragma interface "oleutils.h"
@@ -143,4 +143,4 @@ void wxLogRelease(const char *szInterface, ULONG cRef);
  #define   wxLogRelease(szInterface, cRef)
 #endif  //WXDEBUG

-#endif  //_OLEUTILS_H
+#endif  //_WX_OLEUTILS_H
--- a/include/wx/msw/ole/uuid.h
+++ b/include/wx/msw/ole/uuid.h
@@ -6,13 +6,13 @@
 // Created:     11.07.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 //
 // Notes:       you should link your project with RPCRT4.LIB!
 ///////////////////////////////////////////////////////////////////////////////

-#ifndef   _OLEUUID_H
-#define   _OLEUUID_H
+#ifndef   _WX_OLEUUID_H
+#define   _WX_OLEUUID_H

 #ifdef __GNUG__
 #pragma interface "uuid.h"
@@ -88,4 +88,4 @@ public:
  const char *CForm() const    { return m_pszCForm;          }
 };

-#endif //_OLEUUID_H
+#endif //_WX_OLEUUID_H
--- a/include/wx/msw/palette.h
+++ b/include/wx/msw/palette.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __PALETTEH__
-#define __PALETTEH__
+#ifndef _WX_PALETTE_H_
+#define _WX_PALETTE_H_

 #ifdef __GNUG__
 #pragma interface "palette.h"
@@ -63,4 +63,4 @@ public:
 #define wxColourMap wxPalette

 #endif
-    // __PALETTEH__
+    // _WX_PALETTE_H_
--- a/include/wx/msw/pen.h
+++ b/include/wx/msw/pen.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __PENH__
-#define __PENH__
+#ifndef _WX_PEN_H_
+#define _WX_PEN_H_

 #ifdef __GNUG__
 #pragma interface "pen.h"
@@ -95,4 +95,4 @@ public:
 int wx2msPenStyle(int wx_style);

 #endif
-    // __PENH__
+    // _WX_PEN_H_
--- a/include/wx/msw/pnghand.h
+++ b/include/wx/msw/pnghand.h
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Microsoft, Julian Smart
-// Licence:   	wxWindows license
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifdef __GNUG__
--- a/include/wx/msw/pngread.h
+++ b/include/wx/msw/pngread.h
@@ -8,8 +8,8 @@
 *
 */

-#ifndef __PNGREAD__
-#define __PNGREAD__
+#ifndef _WX_PNGREAD__
+#define _WX_PNGREAD__

 #ifdef __GNUG__
 #pragma interface "pngread.h"
--- a/include/wx/msw/printdlg.h
+++ b/include/wx/msw/printdlg.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __PRINTDLGH__
-#define __PRINTDLGH__
+#ifndef _WX_PRINTDLG_H_
+#define _WX_PRINTDLG_H_

 #ifdef __GNUG__
 #pragma interface "printdlg.h"
@@ -68,4 +68,4 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
 };

 #endif
-    // __PRINTDLGH__
+    // _WX_PRINTDLG_H_
--- a/include/wx/msw/printwin.h
+++ b/include/wx/msw/printwin.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __PRINTWINH__
-#define __PRINTWINH__
+#ifndef _WX_PRINTWIN_H_
+#define _WX_PRINTWIN_H_

 #ifdef __GNUG__
 #pragma interface "printwin.h"
@@ -55,4 +55,4 @@ class WXDLLEXPORT wxWindowsPrintPreview: public wxPrintPreviewBase
 };

 #endif
-    // __PRINTWINH__
+    // _WX_PRINTWIN_H_
--- a/include/wx/msw/private.h
+++ b/include/wx/msw/private.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __PRIVATEH__
-#define __PRIVATEH__
+#ifndef _WX_PRIVATE_H_
+#define _WX_PRIVATE_H_

 #include "wx/defs.h"

@@ -152,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
 #endif

 #endif
-    // __PRIVATEH__
+    // _WX_PRIVATE_H_
--- a/include/wx/msw/radiobox.h
+++ b/include/wx/msw/radiobox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __RADIOBOXH__
-#define __RADIOBOXH__
+#ifndef _WX_RADIOBOX_H_
+#define _WX_RADIOBOX_H_

 #ifdef __GNUG__
 #pragma interface "radiobox.h"
@@ -134,4 +134,4 @@ protected:
 };

 #endif
-    // __RADIOBOXH__
+    // _WX_RADIOBOX_H_
--- a/include/wx/msw/radiobut.h
+++ b/include/wx/msw/radiobut.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __RADIOBUTH__
-#define __RADIOBUTH__
+#ifndef _WX_RADIOBUT_H_
+#define _WX_RADIOBUT_H_

 #ifdef __GNUG__
 #pragma interface "radiobut.h"
@@ -89,4 +89,4 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
 #endif

 #endif
-    // __RADIOBUTH__
+    // _WX_RADIOBUT_H_
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -6,7 +6,7 @@
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

 #ifndef   _REGCONF_H
--- a/include/wx/msw/region.h
+++ b/include/wx/msw/region.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __REGIONH__
-#define __REGIONH__
+#ifndef _WX_REGION_H_
+#define _WX_REGION_H_

 #ifdef __GNUG__
 #pragma interface "region.h"
@@ -134,4 +134,4 @@ private:
 };

 #endif
-	// __REGIONH__
+	// _WX_REGION_H_
--- a/include/wx/msw/registry.h
+++ b/include/wx/msw/registry.h
@@ -6,7 +6,7 @@
 // Created:     03.04.198
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

 #ifndef   _REGISTRY_H
--- a/include/wx/msw/scrolbar.h
+++ b/include/wx/msw/scrolbar.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __SCROLBARH__
-#define __SCROLBARH__
+#ifndef _WX_SCROLBAR_H_
+#define _WX_SCROLBAR_H_

 #ifdef __GNUG__
 #pragma interface "scrolbar.h"
@@ -88,4 +88,4 @@ DECLARE_EVENT_TABLE()
 };

 #endif
-    // __SCROLBARH__
+    // _WX_SCROLBAR_H_
--- a/include/wx/msw/settings.h
+++ b/include/wx/msw/settings.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __SETTINGSH__
-#define __SETTINGSH__
+#ifndef _WX_SETTINGS_H_
+#define _WX_SETTINGS_H_

 #ifdef __GNUG__
 #pragma interface "settings.h"
@@ -126,4 +126,4 @@ public:
 };

 #endif
-    // __SETTINGSH__
+    // _WX_SETTINGS_H_
--- a/include/wx/msw/setup.h
+++ b/include/wx/msw/setup.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __SETUPH__
-#define __SETUPH__
+#ifndef _WX_SETUP_H_
+#define _WX_SETUP_H_

 /*
 * General features
@@ -19,7 +19,7 @@

 #define USE_CONFIG           1
                                // Use wxConfig, with CreateConfig in wxApp
-#define __GOODCOMPILER__
+#define _WX_GOODCOMPILER__
                                // gcc can have problems, but Windows compilers
                                // are generally OK.
 #define WXWIN_COMPATIBILITY  1
@@ -328,4 +328,4 @@
 #endif

 #endif
-    // __SETUPH__
+    // _WX_SETUP_H_
--- a/include/wx/msw/slider.h
+++ b/include/wx/msw/slider.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _SLIDER_H_
--- a/include/wx/msw/slider95.h
+++ b/include/wx/msw/slider95.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _SLIDER95_H_
--- a/include/wx/msw/slidrmsw.h
+++ b/include/wx/msw/slidrmsw.h
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

 #ifndef _SLIDRMSW_H_
--- a/include/wx/msw/spinbutt.h
+++ b/include/wx/msw/spinbutt.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __SPINBUTTH__
-#define __SPINBUTTH__
+#ifndef _WX_SPINBUTT_H_
+#define _WX_SPINBUTT_H_

 #ifdef __GNUG__
 #pragma interface "spinbutt.h"
@@ -102,6 +102,6 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
  { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },

 #endif
-    // __WIN95__
+    // _WX_WIN95__
 #endif
-    // __SPINBUTTH__
+    // _WX_SPINBUTT_H_
--- a/include/wx/msw/statbmp.h
+++ b/include/wx/msw/statbmp.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __STATBMPH__
-#define __STATBMPH__
+#ifndef _WX_STATBMP_H_
+#define _WX_STATBMP_H_

 #ifdef __GNUG__
 #pragma interface "statbmp.h"
@@ -64,4 +64,4 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
 };

 #endif
-    // __STATBMPH__
+    // _WX_STATBMP_H_
--- a/include/wx/msw/statbox.h
+++ b/include/wx/msw/statbox.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __STATBOXH__
-#define __STATBOXH__
+#ifndef _WX_STATBOX_H_
+#define _WX_STATBOX_H_

 #ifdef __GNUG__
 #pragma interface "statbox.h"
@@ -60,4 +60,4 @@ DECLARE_EVENT_TABLE()
 };

 #endif
-    // __STATBOXH__
+    // _WX_STATBOX_H_
--- a/include/wx/msw/statbr95.h
+++ b/include/wx/msw/statbr95.h
@@ -6,7 +6,7 @@
 // Created:     04.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////

 #ifndef   _STATBR95_H
--- a/include/wx/msw/stattext.h
+++ b/include/wx/msw/stattext.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __STATTEXTH__
-#define __STATTEXTH__
+#ifndef _WX_STATTEXT_H_
+#define _WX_STATTEXT_H_

 #ifdef __GNUG__
 #pragma interface "stattext.h"
@@ -61,4 +61,4 @@ class WXDLLEXPORT wxStaticText: public wxControl
 };

 #endif
-    // __STATTEXTH__
+    // _WX_STATTEXT_H_
--- a/include/wx/msw/tabctrl.h
+++ b/include/wx/msw/tabctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TABCTRLH__
-#define __TABCTRLH__
+#ifndef _WX_TABCTRL_H_
+#define _WX_TABCTRL_H_

 #ifdef __GNUG__
 #pragma interface "tabctrl.h"
@@ -150,4 +150,4 @@ typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
  id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },

 #endif
-    // __TABCTRLH__
+    // _WX_TABCTRL_H_
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TBAR95H__
-#define __TBAR95H__
+#ifndef _WX_TBAR95_H_
+#define _WX_TBAR95_H_

 #ifdef __GNUG__
 #pragma interface "tbar95.h"
@@ -93,4 +93,4 @@ DECLARE_EVENT_TABLE()

 #endif // USE_TOOL/BUTTONBAR
 #endif
-    // __TBAR95H__
+    // _WX_TBAR95_H_
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TBARMSWH__
-#define __TBARMSWH__
+#ifndef _WX_TBARMSW_H_
+#define _WX_TBARMSW_H_

 #ifdef __GNUG__
 #pragma interface "tbarmsw.h"
@@ -120,4 +120,4 @@ DECLARE_EVENT_TABLE()

 #endif // USE_TOOL/BUTTONBAR
 #endif
-    // __TBARMSWH__
+    // _WX_TBARMSW_H_
--- a/include/wx/msw/textctrl.h
+++ b/include/wx/msw/textctrl.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TEXTCTRLH__
-#define __TEXTCTRLH__
+#ifndef _WX_TEXTCTRL_H_
+#define _WX_TEXTCTRL_H_

 #ifdef __GNUG__
 #pragma interface "textctrl.h"
@@ -153,4 +153,4 @@ protected:
 };

 #endif
-    // __TEXTCTRLH__
+    // _WX_TEXTCTRL_H_
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TIMERH__
-#define __TIMERH_
+#ifndef _WX_TIMER_H_
+#define _WX_TIMER_H_

 #ifdef __GNUG__
 #pragma interface "timer.h"
@@ -49,4 +49,4 @@ bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
 long WXDLLEXPORT wxGetCurrentTime(void);

 #endif
-    // __TIMERH_
+    // _WX_TIMERH_
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows license
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __TREECTRLH__
-#define __TREECTRLH__
+#ifndef _WX_TREECTRL_H_
+#define _WX_TREECTRL_H_

 #ifdef __GNUG__
 #pragma interface "treectrl.h"
@@ -192,7 +192,7 @@ public:
      // bounding rect
    bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
      //
-    wxTextCtrl& GetEditControl() const;
+    wxTextCtrl* GetEditControl() const;
    
    // operations
    // ----------
@@ -217,7 +217,13 @@ public:
    bool SelectItem(long item);
    bool ScrollTo(long item);
    bool DeleteAllItems();
-    wxTextCtrl& Edit(long item);
+
+    // Edit the label (tree must have the focus)
+    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
+
+    // End label editing, optionally cancelling the edit
+    bool EndEditLabel(bool cancel);
+
    long HitTest(const wxPoint& point, int& flags);
    //  wxImageList *CreateDragImage(long item);
    bool SortChildren(long item);
@@ -229,9 +235,9 @@ public:
    bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
    
 protected:
-    wxTextCtrl m_textCtrl;
-    wxImageList *m_imageListNormal;
-    wxImageList *m_imageListState;
+    wxTextCtrl*  m_textCtrl;
+    wxImageList* m_imageListNormal;
+    wxImageList* m_imageListState;

    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
 };
@@ -289,4 +295,4 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
 #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },

 #endif
-    // __TREECTRLH__
+    // _WX_TREECTRL_H_
--- a/include/wx/msw/wave.h
+++ b/include/wx/msw/wave.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:   	wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WAVEH__
-#define __WAVEH__
+#ifndef _WX_WAVE_H_
+#define _WX_WAVE_H_

 #ifdef __GNUG__
 #pragma interface "wave.h"
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -9,8 +9,8 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

-#ifndef __WINDOWH__
-#define __WINDOWH__
+#ifndef _WX_WINDOW_H_
+#define _WX_WINDOW_H_

 #ifdef __GNUG__
 #pragma interface "window.h"
@@ -84,7 +84,6 @@ class WXDLLEXPORT wxWindow: public wxEvtHandler
 {
  DECLARE_ABSTRACT_CLASS(wxWindow)

-  friend class wxUpdateIterator;
  friend class wxDC;
  friend class wxPaintDC;

@@ -604,7 +603,7 @@ protected:
  bool                  m_useCtl3D;             // Using CTL3D for this control

  bool                  m_inOnSize; 			// Protection against OnSize reentry
-#ifndef __WIN32__
+#ifndef _WX_WIN32__
  // Pointer to global memory, for EDIT controls that need
  // special treatment to reduce USER area consumption.
  WXHGLOBAL             m_globalHandle;
@@ -732,32 +731,6 @@ inline bool wxWindow::IsBeingDeleted(void) { return m_isBeingDeleted; }
 // Window specific (so far)
 wxWindow* WXDLLEXPORT wxGetActiveWindow(void);

-// OBSOLETE
-#if 0
-// Allows iteration through damaged rectangles in OnPaint
-class WXDLLEXPORT wxUpdateIterator
-{
-  int rects;						// How many rects in Update region
-  int current;					        // Current rectangle index
-  void *rp;						// current rectangle
-#ifdef	__WIN32__
-  WXRGNDATA *rlist;					// Storage for regiondata
-#endif
-
- public:
-  wxUpdateIterator(wxWindow* wnd);
-  ~wxUpdateIterator(void);
-
-  operator int (void);
-  wxUpdateIterator* operator ++(int);
-  void GetRect(wxRectangle *rect);
-  int GetX();
-  int GetY();
-  int GetW();
-  int GetH();
-};
-#endif
-
 WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows;

 int WXDLLEXPORT wxCharCodeMSWToWX(int keySym);
@@ -767,4 +740,4 @@ int WXDLLEXPORT wxCharCodeWXToMSW(int id, bool *IsVirtual);
 int WXDLLEXPORT NewControlId(void);

 #endif
-    // __WINDOWH__
+    // _WX_WINDOW_H_