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

author Julian Smart <julian@anthemion.co.uk>

Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)

committer Julian Smart <julian@anthemion.co.uk>

Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)
author Julian Smart <julian@anthemion.co.uk>
Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)
committer Julian Smart <julian@anthemion.co.uk>
Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp

index ca6ef6df3aaf3a1b17f6dfcce31b32d7721a3426..a1f1bba8d5983320d9bb530a41c1dd7578bd9225 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -9,6 +9,9 @@ docs/todo.txt
  docs/licence.txt
  docs/symbols.txt
  
  docs/licence.txt
  docs/symbols.txt
  
+src/*.inc
+src/mkdir
+
  src/common/*.cpp
  src/common/dosyacc.c
  src/common/doslex.c
  src/common/*.cpp
  src/common/dosyacc.c
  src/common/doslex.c
@@ -205,22 +208,22 @@ utils/dialoged/test/*.bmp
  samples/*.txt
  samples/makefile.*
  
  samples/*.txt
  samples/makefile.*
  
-samples/hello/*.cpp
-samples/hello/*.h
-samples/hello/*.def
-samples/hello/makefile.*
-samples/hello/*.xbm
-samples/hello/*.xpm
-samples/hello/*.txt
-samples/hello/*.ico
-samples/hello/*.bmp
-samples/hello/*.rc
-samples/hello/*.wav
+samples/config/*.cpp
+samples/config/*.h
+samples/config/*.def
+samples/config/makefile*.*
+samples/config/*.xbm
+samples/config/*.xpm
+samples/config/*.txt
+samples/config/*.ico
+samples/config/*.bmp
+samples/config/*.rc
+samples/config/*.wav
  
  samples/dynamic/*.cpp
  samples/dynamic/*.h
  samples/dynamic/*.def
  
  samples/dynamic/*.cpp
  samples/dynamic/*.h
  samples/dynamic/*.def
-samples/dynamic/makefile.*
+samples/dynamic/makefile*.*
  samples/dynamic/*.xbm
  samples/dynamic/*.xpm
  samples/dynamic/*.txt
  samples/dynamic/*.xbm
  samples/dynamic/*.xpm
  samples/dynamic/*.txt
@@ -232,7 +235,7 @@ samples/dynamic/*.wav
  samples/bombs/*.cpp
  samples/bombs/*.h
  samples/bombs/*.def
  samples/bombs/*.cpp
  samples/bombs/*.h
  samples/bombs/*.def
-samples/bombs/makefile.*
+samples/bombs/makefile*.*
  samples/bombs/*.xbm
  samples/bombs/*.xpm
  samples/bombs/*.txt
  samples/bombs/*.xbm
  samples/bombs/*.xpm
  samples/bombs/*.txt
@@ -243,7 +246,7 @@ samples/bombs/*.rc
  samples/ipc/*.cpp
  samples/ipc/*.h
  samples/ipc/*.def
  samples/ipc/*.cpp
  samples/ipc/*.h
  samples/ipc/*.def
-samples/ipc/makefile.*
+samples/ipc/makefile*.*
  samples/ipc/*.xbm
  samples/ipc/*.xpm
  samples/ipc/*.ico
  samples/ipc/*.xbm
  samples/ipc/*.xpm
  samples/ipc/*.ico
@@ -254,7 +257,7 @@ samples/types/*.h
  samples/types/*.def
  samples/types/*.rc
  samples/types/*.txt
  samples/types/*.def
  samples/types/*.rc
  samples/types/*.txt
-samples/types/makefile.*
+samples/types/makefile*.*
  samples/types/*.xbm
  samples/types/*.xpm
  samples/types/*.ico
  samples/types/*.xbm
  samples/types/*.xpm
  samples/types/*.ico
@@ -265,7 +268,7 @@ samples/resource/*.def
  samples/resource/*.rc
  samples/resource/*.txt
  samples/resource/*.wxr
  samples/resource/*.rc
  samples/resource/*.txt
  samples/resource/*.wxr
-samples/resource/makefile.*
+samples/resource/makefile*.*
  samples/resource/*.xbm
  samples/resource/*.xpm
  samples/resource/*.ico
  samples/resource/*.xbm
  samples/resource/*.xpm
  samples/resource/*.ico
@@ -273,7 +276,7 @@ samples/resource/*.ico
  samples/animate/*.cpp
  samples/animate/*.h
  samples/animate/*.def
  samples/animate/*.cpp
  samples/animate/*.h
  samples/animate/*.def
-samples/animate/makefile.*
+samples/animate/makefile*.*
  samples/animate/*.xbm
  samples/animate/*.xpm
  samples/animate/*.ico
  samples/animate/*.xbm
  samples/animate/*.xpm
  samples/animate/*.ico
@@ -282,7 +285,7 @@ samples/animate/*.rc
  samples/mdi/*.cpp
  samples/mdi/*.h
  samples/mdi/*.def
  samples/mdi/*.cpp
  samples/mdi/*.h
  samples/mdi/*.def
-samples/mdi/makefile.*
+samples/mdi/makefile*.*
  samples/mdi/*.xbm
  samples/mdi/*.xpm
  samples/mdi/*.ico
  samples/mdi/*.xbm
  samples/mdi/*.xpm
  samples/mdi/*.ico
@@ -293,7 +296,7 @@ samples/mdi/bitmaps/*.ico
  samples/minimal/*.cpp
  samples/minimal/*.h
  samples/minimal/*.def
  samples/minimal/*.cpp
  samples/minimal/*.h
  samples/minimal/*.def
-samples/minimal/makefile.*
+samples/minimal/makefile*.*
  samples/minimal/*.xbm
  samples/minimal/*.xpm
  samples/minimal/*.ico
  samples/minimal/*.xbm
  samples/minimal/*.xpm
  samples/minimal/*.ico
@@ -302,7 +305,7 @@ samples/minimal/*.rc
  samples/controls/*.cpp
  samples/controls/*.h
  samples/controls/*.def
  samples/controls/*.cpp
  samples/controls/*.h
  samples/controls/*.def
-samples/controls/makefile.*
+samples/controls/makefile*.*
  samples/controls/*.xbm
  samples/controls/*.xpm
  samples/controls/*.ico
  samples/controls/*.xbm
  samples/controls/*.xpm
  samples/controls/*.ico
@@ -312,7 +315,7 @@ samples/controls/*.rc
  samples/fractal/*.cpp
  samples/fractal/*.h
  samples/fractal/*.def
  samples/fractal/*.cpp
  samples/fractal/*.h
  samples/fractal/*.def
-samples/fractal/makefile.*
+samples/fractal/makefile*.*
  samples/fractal/*.xbm
  samples/fractal/*.xpm
  samples/fractal/*.ico
  samples/fractal/*.xbm
  samples/fractal/*.xpm
  samples/fractal/*.ico
@@ -321,7 +324,7 @@ samples/fractal/*.rc
  samples/layout/*.cpp
  samples/layout/*.h
  samples/layout/*.def
  samples/layout/*.cpp
  samples/layout/*.h
  samples/layout/*.def
-samples/layout/makefile.*
+samples/layout/makefile*.*
  samples/layout/*.xbm
  samples/layout/*.xpm
  samples/layout/*.ico
  samples/layout/*.xbm
  samples/layout/*.xpm
  samples/layout/*.ico
@@ -331,7 +334,7 @@ samples/layout/*.bmp
  samples/printing/*.cpp
  samples/printing/*.h
  samples/printing/*.def
  samples/printing/*.cpp
  samples/printing/*.h
  samples/printing/*.def
-samples/printing/makefile.*
+samples/printing/makefile*.*
  samples/printing/*.xbm
  samples/printing/*.xpm
  samples/printing/*.txt
  samples/printing/*.xbm
  samples/printing/*.xpm
  samples/printing/*.txt
@@ -343,7 +346,7 @@ samples/printing/*.afm
  samples/toolbar/*.cpp
  samples/toolbar/*.h
  samples/toolbar/*.def
  samples/toolbar/*.cpp
  samples/toolbar/*.h
  samples/toolbar/*.def
-samples/toolbar/makefile.*
+samples/toolbar/makefile*.*
  samples/toolbar/*.txt
  samples/toolbar/*.xbm
  samples/toolbar/*.xpm
  samples/toolbar/*.txt
  samples/toolbar/*.xbm
  samples/toolbar/*.xpm
@@ -358,7 +361,7 @@ samples/docview/*.h
  samples/docview/*.cpp
  samples/docview/*.def
  samples/docview/*.rc
  samples/docview/*.cpp
  samples/docview/*.def
  samples/docview/*.rc
-samples/docview/makefile.*
+samples/docview/makefile*.*
  samples/docview/*.xbm
  samples/docview/*.xpm
  samples/docview/*.txt
  samples/docview/*.xbm
  samples/docview/*.xpm
  samples/docview/*.txt
@@ -369,7 +372,7 @@ samples/memcheck/*.h
  samples/memcheck/*.cpp
  samples/memcheck/*.def
  samples/memcheck/*.rc
  samples/memcheck/*.cpp
  samples/memcheck/*.def
  samples/memcheck/*.rc
-samples/memcheck/makefile.*
+samples/memcheck/makefile*.*
  samples/memcheck/*.xbm
  samples/memcheck/*.xpm
  samples/memcheck/*.txt
  samples/memcheck/*.xbm
  samples/memcheck/*.xpm
  samples/memcheck/*.txt
@@ -380,7 +383,7 @@ samples/odbc/*.h
  samples/odbc/*.cpp
  samples/odbc/*.def
  samples/odbc/*.rc
  samples/odbc/*.cpp
  samples/odbc/*.def
  samples/odbc/*.rc
-samples/odbc/makefile.*
+samples/odbc/makefile*.*
  samples/odbc/*.inf
  samples/odbc/*.xbm
  samples/odbc/*.xpm
  samples/odbc/*.inf
  samples/odbc/*.xbm
  samples/odbc/*.xpm
@@ -393,7 +396,7 @@ samples/dialogs/*.h
  samples/dialogs/*.cpp
  samples/dialogs/*.def
  samples/dialogs/*.rc
  samples/dialogs/*.cpp
  samples/dialogs/*.def
  samples/dialogs/*.rc
-samples/dialogs/makefile.*
+samples/dialogs/makefile*.*
  samples/dialogs/*.xbm
  samples/dialogs/*.xpm
  samples/dialogs/*.txt
  samples/dialogs/*.xbm
  samples/dialogs/*.xpm
  samples/dialogs/*.txt
@@ -406,7 +409,7 @@ samples/wxpoem/*.def
  samples/wxpoem/*.rc
  samples/wxpoem/*.inf
  samples/wxpoem/*.txt
  samples/wxpoem/*.rc
  samples/wxpoem/*.inf
  samples/wxpoem/*.txt
-samples/wxpoem/makefile.*
+samples/wxpoem/makefile*.*
  samples/wxpoem/*.xbm
  samples/wxpoem/*.xpm
  samples/wxpoem/*.ico
  samples/wxpoem/*.xbm
  samples/wxpoem/*.xpm
  samples/wxpoem/*.ico
@@ -420,7 +423,7 @@ samples/pressup/*.def
  samples/pressup/*.rc
  samples/pressup/*.inf
  samples/pressup/*.txt
  samples/pressup/*.rc
  samples/pressup/*.inf
  samples/pressup/*.txt
-samples/pressup/makefile.*
+samples/pressup/makefile*.*
  samples/pressup/*.xbm
  samples/pressup/*.xpm
  samples/pressup/*.ico
  samples/pressup/*.xbm
  samples/pressup/*.xpm
  samples/pressup/*.ico
@@ -432,7 +435,7 @@ samples/validate/*.def
  samples/validate/*.rc
  samples/validate/*.inf
  samples/validate/*.txt
  samples/validate/*.rc
  samples/validate/*.inf
  samples/validate/*.txt
-samples/validate/makefile.*
+samples/validate/makefile*.*
  samples/validate/*.xbm
  samples/validate/*.xpm
  samples/validate/*.ico
  samples/validate/*.xbm
  samples/validate/*.xpm
  samples/validate/*.ico
@@ -444,7 +447,7 @@ samples/events/*.def
  samples/events/*.rc
  samples/events/*.inf
  samples/events/*.txt
  samples/events/*.rc
  samples/events/*.inf
  samples/events/*.txt
-samples/events/makefile.*
+samples/events/makefile*.*
  samples/events/*.xbm
  samples/events/*.xpm
  samples/events/*.ico
  samples/events/*.xbm
  samples/events/*.xpm
  samples/events/*.ico
@@ -455,7 +458,7 @@ samples/treectrl/*.h
  samples/treectrl/*.def
  samples/treectrl/*.rc
  samples/treectrl/*.txt
  samples/treectrl/*.def
  samples/treectrl/*.rc
  samples/treectrl/*.txt
-samples/treectrl/makefile.*
+samples/treectrl/makefile*.*
  samples/treectrl/*.xbm
  samples/treectrl/*.xpm
  samples/treectrl/bitmaps/*.xbm
  samples/treectrl/*.xbm
  samples/treectrl/*.xpm
  samples/treectrl/bitmaps/*.xbm
@@ -470,7 +473,7 @@ samples/listctrl/*.h
  samples/listctrl/*.def
  samples/listctrl/*.rc
  samples/listctrl/*.txt
  samples/listctrl/*.def
  samples/listctrl/*.rc
  samples/listctrl/*.txt
-samples/listctrl/makefile.*
+samples/listctrl/makefile*.*
  samples/listctrl/*.xbm
  samples/listctrl/*.xpm
  samples/listctrl/bitmaps/*.xbm
  samples/listctrl/*.xbm
  samples/listctrl/*.xpm
  samples/listctrl/bitmaps/*.xbm
@@ -485,7 +488,7 @@ samples/splitter/*.h
  samples/splitter/*.def
  samples/splitter/*.rc
  samples/splitter/*.txt
  samples/splitter/*.def
  samples/splitter/*.rc
  samples/splitter/*.txt
-samples/splitter/makefile.*
+samples/splitter/makefile*.*
  samples/splitter/*.xbm
  samples/splitter/*.xpm
  samples/splitter/*.ico
  samples/splitter/*.xbm
  samples/splitter/*.xpm
  samples/splitter/*.ico
@@ -496,7 +499,7 @@ samples/grid/*.h
  samples/grid/*.def
  samples/grid/*.rc
  samples/grid/*.txt
  samples/grid/*.def
  samples/grid/*.rc
  samples/grid/*.txt
-samples/grid/makefile.*
+samples/grid/makefile*.*
  samples/grid/*.xbm
  samples/grid/*.xpm
  samples/grid/*.ico
  samples/grid/*.xbm
  samples/grid/*.xpm
  samples/grid/*.ico
@@ -507,7 +510,7 @@ samples/internat/*.h
  samples/internat/*.def
  samples/internat/*.rc
  samples/internat/*.txt
  samples/internat/*.def
  samples/internat/*.rc
  samples/internat/*.txt
-samples/internat/makefile.*
+samples/internat/makefile*.*
  samples/internat/*.xbm
  samples/internat/*.xpm
  samples/internat/*.po
  samples/internat/*.xbm
  samples/internat/*.xpm
  samples/internat/*.po
@@ -520,7 +523,7 @@ samples/checklst/*.h
  samples/checklst/*.def
  samples/checklst/*.rc
  samples/checklst/*.txt
  samples/checklst/*.def
  samples/checklst/*.rc
  samples/checklst/*.txt
-samples/checklst/makefile.*
+samples/checklst/makefile*.*
  samples/checklst/*.xbm
  samples/checklst/*.xpm
  samples/checklst/*.ico
  samples/checklst/*.xbm
  samples/checklst/*.xpm
  samples/checklst/*.ico
@@ -528,7 +531,7 @@ samples/checklst/*.bmp
  
  samples/dnd/*.cpp
  samples/dnd/*.h
  
  samples/dnd/*.cpp
  samples/dnd/*.h
-samples/dnd/makefile.*
+samples/dnd/makefile*.*
  samples/dnd/*.rc
  samples/dnd/*.def
  samples/dnd/*.bmp
  samples/dnd/*.rc
  samples/dnd/*.def
  samples/dnd/*.bmp
@@ -539,7 +542,7 @@ samples/dnd/*.txt
  
  samples/tab/*.cpp
  samples/tab/*.h
  
  samples/tab/*.cpp
  samples/tab/*.h
-samples/tab/makefile.*
+samples/tab/makefile*.*
  samples/tab/*.rc
  samples/tab/*.def
  samples/tab/*.bmp
  samples/tab/*.rc
  samples/tab/*.def
  samples/tab/*.bmp
@@ -550,7 +553,7 @@ samples/tab/*.txt
  
  samples/png/*.cpp
  samples/png/*.h
  
  samples/png/*.cpp
  samples/png/*.h
-samples/png/makefile.*
+samples/png/makefile*.*
  samples/png/*.rc
  samples/png/*.def
  samples/png/*.bmp
  samples/png/*.rc
  samples/png/*.def
  samples/png/*.bmp
diff --git a/distrib/msw/gtk.rsp b/distrib/msw/gtk.rsp

index a0701719f52078438d2620a9355e8d2c9ecacc3c..f5814f55a5bd38b11fefd4335cec35cb2f243edf 100644 (file)
--- a/distrib/msw/gtk.rsp
+++ b/distrib/msw/gtk.rsp
@@ -8,6 +8,7 @@ docs/gtk/*.html
  src/mkdirs
  src/Makefile
  src/Makefile.in
  src/mkdirs
  src/Makefile
  src/Makefile.in
+src/*.inc
  
  src/gtk/*.cpp
  src/gtk/*.c
  
  src/gtk/*.cpp
  src/gtk/*.c
@@ -28,6 +29,18 @@ src/gdk_imlib/COPYING.LIB
  src/gdk_imlib/README
  src/gdk_imlib/ChangeLog
  
  src/gdk_imlib/README
  src/gdk_imlib/ChangeLog
  
+src/iodbc/*.c
+src/iodbc/*.ci
+src/iodbc/*.h
+src/iodbc/IAFA-PACKAGE
+src/iodbc/README
+src/iodbc/*.exp
+src/iodbc/*.mk
+src/iodbc/autoconfig
+src/iodbc/build
+src/iodbc/Changes.log
+src/iodbc/postgres/*.h
+
  install/gtk/*
  
  misc/afm/*
  install/gtk/*
  
  misc/afm/*
diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat

index 74237fe03d7d78fdbed1e0e8c909f4afc91b13d1..fa765e1b4ad07e2925e952daaf75b4ffa3a4ac77 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -1,27 +1,29 @@
  @echo off
  rem Zip up an external, generic + Windows distribution of wxWindows 2.0
  @echo off
  rem Zip up an external, generic + Windows distribution of wxWindows 2.0
-if "%1" == "" goto usage
-if "%2" == "" goto usage
+set src=d:\wx2\wxWindows
+set dest=%src\deliver
+if "%src" == "" goto usage
+if "%dest" == "" goto usage
  echo About to archive an external wxWindows distribution:
  echo About to archive an external wxWindows distribution:
-echo   From   %1
-echo   To     %2\wx200gen.zip, %2\wx200doc.zip, %2\wx200msw.zip, %2\wx200ps.zip, %2\wx200hlp.zip, %2\wx200htm.zip, %2\wx200pdf.zip
+echo   From   %src
+echo   To     %dest\wx200gen.zip, %dest\wx200doc.zip, %dest\wx200msw.zip, %dest\wx200ps.zip, %dest\wx200hlp.zip, %dest\wx200htm.zip, %dest\wx200pdf.zip
  echo CTRL-C if this is not correct.
  pause
  
  echo CTRL-C if this is not correct.
  pause
  
-erase %2\wx200*.zip
+erase %dest\wx200*.zip
  
  
-cd %1
+cd %src
  echo Zipping...
  echo Zipping...
-zip32 -@ %2\wx200gen.zip < %1\distrib\msw\generic.rsp
-zip32 -@ %2\wx200msw.zip < %1\distrib\msw\msw.rsp
-zip32 -@ %2\wx200gtk.zip < %1\distrib\msw\gtk.rsp
-zip32 -@ %2\wx200doc.zip < %1\distrib\msw\docsrc.rsp
+zip32 -@ %dest\wx200gen.zip < %src\distrib\msw\generic.rsp
+zip32 -@ %dest\wx200msw.zip < %src\distrib\msw\msw.rsp
+zip32 -@ %dest\wx200gtk.zip < %src\distrib\msw\gtk.rsp
+zip32 -@ %dest\wx200doc.zip < %src\distrib\msw\docsrc.rsp
  
  
-zip32 -@ %2\wx200hlp.zip < %1\distrib\msw\wx_hlp.rsp
-zip32 -@ %2\wx200htm.zip < %1\distrib\msw\wx_html.rsp
-zip32 -@ %2\wx200pdf.zip < %1\distrib\msw\wx_pdf.rsp
+zip32 -@ %dest\wx200hlp.zip < %src\distrib\msw\wx_hlp.rsp
+zip32 -@ %dest\wx200htm.zip < %src\distrib\msw\wx_html.rsp
+zip32 -@ %dest\wx200pdf.zip < %src\distrib\msw\wx_pdf.rsp
  
  
-cd %2
+cd %dest
  
  echo wxWindows archived.
  goto end
  
  echo wxWindows archived.
  goto end
diff --git a/docs/latex/wx/dialog.tex b/docs/latex/wx/dialog.tex

index c65b41d41c8525369441c9a7ed8f6c9994fd4ae5..95d758c852066344421c20403e5e2786f15a9d39 100644 (file)
--- a/docs/latex/wx/dialog.tex
+++ b/docs/latex/wx/dialog.tex
@@ -30,8 +30,9 @@ dialog to respond to system close events.
  \twocolitem{\windowstyle{wxCAPTION}}{Puts a caption on the dialog box (Motif only).}
  \twocolitem{\windowstyle{wxDEFAULT\_DIALOG\_STYLE}}{Equivalent to a combination of wxCAPTION, wxSYSTEM\_MENU and wxTHICK\_FRAME}
  \twocolitem{\windowstyle{wxRESIZE\_BORDER}}{Display a resizeable frame around the window (Motif only).}
  \twocolitem{\windowstyle{wxCAPTION}}{Puts a caption on the dialog box (Motif only).}
  \twocolitem{\windowstyle{wxDEFAULT\_DIALOG\_STYLE}}{Equivalent to a combination of wxCAPTION, wxSYSTEM\_MENU and wxTHICK\_FRAME}
  \twocolitem{\windowstyle{wxRESIZE\_BORDER}}{Display a resizeable frame around the window (Motif only).}
-\twocolitem{\windowstyle{wxSYSTEM\_MENU}}{Display a system menu (Motif only).}
-\twocolitem{\windowstyle{wxTHICK\_FRAME}}{Display a thick frame around the window (Motif only).}
+\twocolitem{\windowstyle{wxSYSTEM\_MENU}}{Display a system menu.}
+\twocolitem{\windowstyle{wxTHICK\_FRAME}}{Display a thick frame around the window.}
+\twocolitem{\windowstyle{wxSTAY\_ON\_TOP}}{The dialog stays on top of all other windows (Windows only).}
  \twocolitem{\windowstyle{wxNO\_3D}}{Under Windows, specifies that the child controls
  should not have 3D borders unless specified in the control.}
  \end{twocollist}
  \twocolitem{\windowstyle{wxNO\_3D}}{Under Windows, specifies that the child controls
  should not have 3D borders unless specified in the control.}
  \end{twocollist}
diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex

index fa68e77a32ec8468b0dd413941c5186676ccf4a1..2c2ac8ac38058eeca32240afbf58e5e4c8ac51bb 100644 (file)
--- a/docs/latex/wx/treectrl.tex
+++ b/docs/latex/wx/treectrl.tex
@@ -111,12 +111,35 @@ Deletes all the items in the control.
  
  Deletes the specified item.
  
  
  Deletes the specified item.
  
-\membersection{wxTreeCtrl::Edit}\label{wxtreectrledit}
+\membersection{wxTreeCtrl::EditLabel}\label{wxtreectrleditlabel}
  
  
-\func{wxTextCtrl\&}{Edit}{\param{long }{item}}
+\func{wxTextCtrl*}{EditLabel}{\param{long }{item}, \param{wxClassInfo*}{ textControlClass = CLASSINFO(wxTextCtrl)}}
  
  Starts editing the label of the given item, returning the text control that the tree control uses for editing.
  
  
  Starts editing the label of the given item, returning the text control that the tree control uses for editing.
  
+Pass another {\it textControlClass} if a derived class is required. It usually will be, in order for
+the application to detect when editing has finished and to call \helpref{wxTreeCtrl::EndEditLabel}{wxtreectrlendeditlabel}.
+
+Do not delete the text control yourself.
+
+This function is currently supported under Windows only.
+
+\wxheading{See also}
+
+\helpref{wxTreeCtrl::EndEditLabel}{wxtreectrlendeditlabel}
+
+\membersection{wxTreeCtrl::EndEditLabel}\label{wxtreectrlendeditlabel}
+
+\func{bool}{EndEditLabel}{\param{bool }{cancelEdit}}
+
+Ends label editing. If {\it cancelEdit} is TRUE, the edit will be cancelled.
+
+This function is currently supported under Windows only.
+
+\wxheading{See also}
+
+\helpref{wxTreeCtrl::EditLabel}{wxtreectrleditlabel}
+
  \membersection{wxTreeCtrl::EnsureVisible}\label{wxtreectrlensurevisible}
  
  \func{bool}{EnsureVisible}{\param{long }{item}}
  \membersection{wxTreeCtrl::EnsureVisible}\label{wxtreectrlensurevisible}
  
  \func{bool}{EnsureVisible}{\param{long }{item}}
diff --git a/include/wx/msw/app.h b/include/wx/msw/app.h

index 54b58a4ee9cd90b5f85802e07fea6ae3c9d2c172..0889410bf6cc0fdf4bfa2ed0227d653a33b9bf5a 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "app.h"
@@ -162,5 +162,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
  #endif
  
  #endif
  #endif
  
  #endif
-    // __APPH__
+    // _WX_APP_H_
  
  
diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h

index cbe8b012fcffec68b23d8df185981870f6000314..a8c9c2507bfc11ea472612500a84290b675cb504 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "bitmap.h"
@@ -199,4 +199,4 @@ public:
  
  };
  #endif
  
  };
  #endif
-  // __BITMAPH__
+  // _WX_BITMAP_H_
diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h

index 118888a4e91b9836356b1573e555b919eaa2d71a..956c9128f98dda34812497e492f35cf601c97a47 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "bmpbuttn.h"
@@ -82,4 +82,4 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
  };
  
  #endif
  };
  
  #endif
-    // __BMPBUTTNH__
+    // _WX_BMPBUTTN_H_
diff --git a/include/wx/msw/brush.h b/include/wx/msw/brush.h

index 59fce013ad695743e49ef377cd64daf48775fd31..71367662a470a6e79849ed2f3e545e524e9cba3f 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "brush.h"
@@ -81,4 +81,4 @@ public:
  };
  
  #endif
  };
  
  #endif
-    // __BRUSHH__
+    // _WX_BRUSH_H_
diff --git a/include/wx/msw/button.h b/include/wx/msw/button.h

index d4755612fa1744ba57d25c598c158336cfe58bc8..34e0824d6daf97e40151c26bf82ac8fbd448365f 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "button.h"
@@ -53,4 +53,4 @@ class WXDLLEXPORT wxButton: public wxControl
  };
  
  #endif
  };
  
  #endif
-    // __BUTTONH__
+    // _WX_BUTTON_H_
diff --git a/include/wx/msw/checkbox.h b/include/wx/msw/checkbox.h

index 553224d02cdda06bb20cf6cfdd22d58777688007..e5ddc460f6704b1128cdc716a216ba107f2c6834 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "checkbox.h"
@@ -81,4 +81,4 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
    virtual void SetLabel(const wxBitmap *bitmap);
  };
  #endif
    virtual void SetLabel(const wxBitmap *bitmap);
  };
  #endif
-    // __CHECKBOXH__
+    // _WX_CHECKBOX_H_
diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h

index 51bd9f0a77461aea58584e90a56be4400fe9398e..f511a98087bd14949bb5701ffeea5c0f20559bac 100644 (file)
--- 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>
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "checklst.h"
diff --git a/include/wx/msw/choice.h b/include/wx/msw/choice.h

index a70061a06feb9e8aecb77229b21b4afba7fa2a64..e3fd471b6dd24c71dbf65c09fefda66829709195 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "choice.h"
@@ -26,9 +26,7 @@ class WXDLLEXPORT wxChoice: public wxControl
    DECLARE_DYNAMIC_CLASS(wxChoice)
  
   public:
    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,
  
    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 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);
    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);
                         WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
  
    long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+
+protected:
+  int       m_noStrings;
+
  };
  
  #endif
  };
  
  #endif
-       // __CHOICEH__
+       // _WX_CHOICE_H_
diff --git a/include/wx/msw/clipbrd.h b/include/wx/msw/clipbrd.h

index abdabfb1420a9e80351f1b56f774731aa22df8c4..8d4d4edfb23af8ea1d0b38d9ca0eb28b4d89f37f 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "clipbrd.h"
@@ -108,4 +108,4 @@ extern wxClipboard* WXDLLEXPORT wxTheClipboard;
  
  #endif // USE_CLIPBOARD
  #endif
  
  #endif // USE_CLIPBOARD
  #endif
-    // __CLIPBRDH__
+    // _WX_CLIPBRD_H_
diff --git a/include/wx/msw/colordlg.h b/include/wx/msw/colordlg.h

index 09cd225e90f2dccd1ff8f9affeb82fe7acba0996..5643ef6f2f32b3e1a86133ce4f2a1211121db405 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "colordlg.h"
@@ -26,19 +26,20 @@
  
  class WXDLLEXPORT wxColourDialog: public wxDialog
  {
  
  class WXDLLEXPORT wxColourDialog: public wxDialog
  {
- DECLARE_DYNAMIC_CLASS(wxColourDialog)
- protected:
-  wxColourData colourData;
-  wxWindow *dialogParent;
- public:
-  wxColourDialog(void);
-  wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
-
-  bool Create(wxWindow *parent, wxColourData *data = NULL);
-
-  int ShowModal(void);
-  wxColourData& GetColourData(void) { return colourData; }
+DECLARE_DYNAMIC_CLASS(wxColourDialog)
+public:
+    wxColourDialog(void);
+    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
+
+    bool Create(wxWindow *parent, wxColourData *data = NULL);
+
+    int ShowModal(void);
+    wxColourData& GetColourData(void) { return m_colourData; }
+
+protected:
+    wxColourData        m_colourData;
+    wxWindow*           m_dialogParent;
  };
  
  #endif
  };
  
  #endif
-    // __COLORDLGH__
+    // _WX_COLORDLG_H_
diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h

index c4632bde4d3a69cd7b6ba5e592b03a6d1bc03cb7..9e001f03e7a13494dfbf233dcb94efe79dca7302 100644 (file)
--- 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$
  // Modified by:
  // Created:     01/02/97
  // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
  // Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __COLOURH__
-#define __COLOURH__
+#ifndef _WX_COLOUR_H_
+#define _WX_COLOUR_H_
  
  #ifdef __GNUG__
  #pragma interface "colour.h"
  
  #ifdef __GNUG__
  #pragma interface "colour.h"
@@ -68,4 +68,4 @@ public:
  #define wxColor wxColour
  
  #endif
  #define wxColor wxColour
  
  #endif
-       // __COLOURH__
+       // _WX_COLOUR_H_
diff --git a/include/wx/msw/combobox.h b/include/wx/msw/combobox.h

index fdebc76c487f9ed9a60d4acc81baa692c4393591..0739774280b7a0eee7d8bbb64c97e47b91a520f8 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "combobox.h"
@@ -80,4 +80,4 @@ class WXDLLEXPORT wxComboBox: public wxChoice
  
  #endif // USE_COMBOBOX
  #endif
  
  #endif // USE_COMBOBOX
  #endif
-    // __COMBOBOXH__
+    // _WX_COMBOBOX_H_
diff --git a/include/wx/msw/control.h b/include/wx/msw/control.h

index 0d9f09d682062d4ba643649e1ab2d3a18fe36e95..495799bf32021d2e4d822a286f1f3180014777c2 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "control.h"
@@ -83,4 +83,4 @@ inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
  #endif
  
  #endif
  #endif
  
  #endif
-    // __CONTROLH__
+    // _WX_CONTROL_H_
diff --git a/include/wx/msw/curico.h b/include/wx/msw/curico.h

index 0ea5f02cf61af26c6b51139e4d280c83ef01c96f..b85a39b1948f1c4ed87a73f318abc12c68ae1ac1 100644 (file)
--- 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$
  // 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,
  /////////////////////////////////////////////////////////////////////////////
  
  HICON    ReadIconFile(    char *szFileName, HINSTANCE hInst,
diff --git a/include/wx/msw/cursor.h b/include/wx/msw/cursor.h

index 41d34c3ba758ac95e1e4d54f22bb33ce573e0d86..f72d922d05656ebe37b7775075485961bac4178e 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "cursor.h"
@@ -66,4 +66,4 @@ public:
  };
  
  #endif
  };
  
  #endif
-    // __CURSORH__
+    // _WX_CURSOR_H_
diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h

index 1b4c0457a2b3b8c4bacf29f12cdfdff19789ef3a..8d90a1797ba9b44dfda8e799981e5b1348be870d 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dc.h"
@@ -412,4 +412,4 @@ extern int wxPageNumber;
  
  
  #endif
  
  
  #endif
-    // __DCH__
+    // _WX_DC_H_
diff --git a/include/wx/msw/dcclient.h b/include/wx/msw/dcclient.h

index 9851d78d7756dfc9d8f7510efc8308fc53782220..126eb39076a9e6978b110ff67b57e9184c13509b 100644 (file)
--- a/include/wx/msw/dcclient.h
+++ b/include/wx/msw/dcclient.h
@@ -9,8 +9,8 @@
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __DCCLIENTH__
-#define __DCCLIENTH__
+#ifndef _WX_DCCLIENT_H_
+#define _WX_DCCLIENT_H_
  
  #ifdef __GNUG__
  #pragma interface "dcclient.h"
  
  #ifdef __GNUG__
  #pragma interface "dcclient.h"
@@ -62,4 +62,4 @@ class WXDLLEXPORT wxPaintDC: public wxDC
  };
  
  #endif
  };
  
  #endif
-    // __DCCLIENTH__
+    // _WX_DCCLIENT_H_
diff --git a/include/wx/msw/dcmemory.h b/include/wx/msw/dcmemory.h

index 7039c610c169c66c1eaf6cf2d35fdacc6a4f8ea2..f278bc447ec82f3c2a043aa2324415504676536d 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dcmemory.h"
@@ -32,4 +32,4 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
  };
  
  #endif
  };
  
  #endif
-    // __DCMEMORYH__
+    // _WX_DCMEMORY_H_
diff --git a/include/wx/msw/dcprint.h b/include/wx/msw/dcprint.h

index 5a34cd0bb5f2442ec3c7e3a4fec1116c449e7f08..8ad3c3574b9f21d1ed413587163e79c82e598371 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dcprint.h"
@@ -34,5 +34,5 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
  WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
  
  #endif
  WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
  
  #endif
-    // __DCPRINTH__
+    // _WX_DCPRINT_H_
  
  
diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h

index 09d1ac51d0f6f9ef13f54886f2c9a97e36c49911..6a64c9e9349bdb08892d91a10e6fff690e3ba9f1 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dcscreen.h"
@@ -35,5 +35,5 @@ class WXDLLEXPORT wxScreenDC: public wxDC
  };
  
  #endif
  };
  
  #endif
-    // __DCSCREENH__
+    // _WX_DCSCREEN_H_
  
  
diff --git a/include/wx/msw/dde.h b/include/wx/msw/dde.h

index 31aaa334a86d29139e2f2d58d67120992deeac07..183c55243c1201016c87541147b105986c4b183b 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dde.h"
@@ -159,4 +159,4 @@ void WXDLLEXPORT wxDDECleanUp();
  #endif
  
  #endif
  #endif
  
  #endif
-    // __DDEH__
+    // _WX_DDE_H_
diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h

index 99dec3f0ef1978eaf38581fe241e4e4b959f8184..d4a19e94e83e1d69a9fb12d2f0b6c22d80ed71e7 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -9,8 +9,8 @@
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __DIALOGH__
-#define __DIALOGH__
+#ifndef _WX_DIALOG_H_
+#define _WX_DIALOG_H_
  
  #ifdef __GNUG__
  #pragma interface "dialog.h"
  
  #ifdef __GNUG__
  #pragma interface "dialog.h"
@@ -118,4 +118,4 @@ DECLARE_EVENT_TABLE()
  };
  
  #endif
  };
  
  #endif
-    // __DIALOGH__
+    // _WX_DIALOG_H_
diff --git a/include/wx/msw/dib.h b/include/wx/msw/dib.h

index 754651fb83434a81c8f76cdfe1a61323e6d42261..885663d0a8da147f5fb92ec53147b2f9d1cc0785 100644 (file)
--- 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$
  // 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
  /////////////////////////////////////////////////////////////////////////////
  
  // Save (device dependent) wxBitmap as a DIB
diff --git a/include/wx/msw/dibutils.h b/include/wx/msw/dibutils.h

index b43d4fab2f19748ae867075544b2dc6443f35866..746660d6886a65a1c8b49c487d32a7b6997b5f01 100644 (file)
--- 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
  // Created:     04/01/98
  // RCS-ID:      $Id$
  // Copyright:   (c) Microsoft, Julian Smart
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
  /***************************************************************************
  /////////////////////////////////////////////////////////////////////////////
  
  /***************************************************************************
diff --git a/include/wx/msw/dirdlg.h b/include/wx/msw/dirdlg.h

index bbe29b3de56da2c09fb1524a4be8afe413068316..7f3a8dd5f97e4ee8177777aa69e59f3e623aaa25 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "dirdlg.h"
@@ -44,4 +44,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __DIRDLGH__
+    // _WX_DIRDLG_H_
diff --git a/include/wx/msw/filedlg.h b/include/wx/msw/filedlg.h

index 219d0b5c8ebc68f424739e8ce37452f1e28f5cf2..356dc8ea0314a12ff4286f4c5991097501ad115c 100644 (file)
--- 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$
  // 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"
  
  #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
  char* WXDLLEXPORT wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
  
  #endif
-    // __FILEDLGH__
+    // _WX_FILEDLG_H_
diff --git a/include/wx/msw/font.h b/include/wx/msw/font.h

index 5c1f7dc6b0aff793483bf99c613b3b0c1c4adbf8..2ce96b9bd903d5a488e7b665da4a3b0e57f90306 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "font.h"
@@ -95,4 +95,4 @@ public:
  };
  
  #endif
  };
  
  #endif
-    // __FONTH__
+    // _WX_FONT_H_
diff --git a/include/wx/msw/fontdlg.h b/include/wx/msw/fontdlg.h

index 9ef6c77751b610b32617aa8933225cb18e8d7574..43d5d315beb5015e6d715f9b0f6264deb7c4c116 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "fontdlg.h"
@@ -25,20 +25,22 @@
   
  class WXDLLEXPORT wxFontDialog: public wxDialog
  {
   
  class WXDLLEXPORT wxFontDialog: public wxDialog
  {
- DECLARE_DYNAMIC_CLASS(wxFontDialog)
- protected:
-  wxWindow *dialogParent;
-  wxFontData fontData;
- public:
-  wxFontDialog(void);
-  wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
-
-  bool Create(wxWindow *parent, wxFontData *data = NULL);
-
-  int ShowModal(void);
-  wxFontData& GetFontData(void) { return fontData; }
+DECLARE_DYNAMIC_CLASS(wxFontDialog)
+
+public:
+    wxFontDialog(void);
+    wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
+
+    bool Create(wxWindow *parent, wxFontData *data = NULL);
+
+    int ShowModal(void);
+    wxFontData& GetFontData(void) { return m_fontData; }
+
+protected:
+    wxWindow *m_dialogParent;
+    wxFontData m_fontData;
  };
  
  #endif
  };
  
  #endif
-    // __FONTDLGH__
+    // _WX_FONTDLG_H_
  
  
diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h

index 12fe97a0d1e77ef08866564b7681c9a374c049dc..cb9baa3d64081d7f67767db7a69aae5fc85dc419 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -9,8 +9,8 @@
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __FRAMEH__
-#define __FRAMEH__
+#ifndef _WX_FRAME_H_
+#define _WX_FRAME_H_
  
  #ifdef __GNUG__
  #pragma interface "frame.h"
  
  #ifdef __GNUG__
  #pragma interface "frame.h"
@@ -172,4 +172,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __FRAMEH__
+    // _WX_FRAME_H_
diff --git a/include/wx/msw/gauge.h b/include/wx/msw/gauge.h

index d2effc34415006c7f16760883340d3c1a5b18f9f..0751cada22767de81676f5acbae7b3bc8b277350 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "gauge.h"
@@ -27,4 +27,4 @@
  #endif
  
  #endif
  #endif
  
  #endif
-    // __GAUGEH__
+    // _WX_GAUGE_H_
diff --git a/include/wx/msw/gauge95.h b/include/wx/msw/gauge95.h

index c6d79fa6d960705a46fa58a95c6c3ea801c2016c..362a7586549a9b476426360846e8d0b8893bcd22 100644 (file)
--- 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$
  // 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_
  /////////////////////////////////////////////////////////////////////////////
  
  #ifndef _GAUGE95_H_
diff --git a/include/wx/msw/gaugemsw.h b/include/wx/msw/gaugemsw.h

index e643f18f150a6d8a86f7fa92477fad40a744a87c..c3c5954ff4b4c2e256030d5a0d44e22acf31c760 100644 (file)
--- 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$
  // 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_
  /////////////////////////////////////////////////////////////////////////////
  
  #ifndef _GAUGEMSW_H_
diff --git a/include/wx/msw/gdiobj.h b/include/wx/msw/gdiobj.h

index 31c3f4ad978ccfa0c0114a585d0ed050133a7352..1950d12ffe039991b6dc82e47713e5e8b08fd6f9 100644 (file)
--- 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$
  // 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"
  
  
  #include "wx/object.h"
  
@@ -64,4 +64,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __GDIOBJH__
+    // _WX_GDIOBJ_H_
diff --git a/include/wx/msw/helpwin.h b/include/wx/msw/helpwin.h

index 4d460f037a540314946578058d12ca6bcf18f5fe..786155231fc99f399ca941491af686e6df70afa5 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "helpwin.h"
@@ -51,4 +51,4 @@ protected:
  
  #endif // USE_HELP
  #endif
  
  #endif // USE_HELP
  #endif
-    // __HELPWINH__
+    // _WX_HELPWIN_H_
diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h

index 0711d68d85301d94c7d56ea221ad96f30cccfdc3..27d731129856997bf0da0855a90b901629b246c3 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "icon.h"
@@ -99,4 +99,4 @@ public:
  };
  
  #endif
  };
  
  #endif
-    // __ICONH__
+    // _WX_ICON_H_
diff --git a/include/wx/msw/imaglist.h b/include/wx/msw/imaglist.h

index 51812b097f37e46aafb65c2598ebaa5de7a7a2ad..153cfd00d1c8f3444f0ae7332f014fee2f8f30d5 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "imaglist.h"
@@ -223,4 +223,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __IMAGLISTH__
+    // _WX_IMAGLIST_H_
diff --git a/include/wx/msw/iniconf.h b/include/wx/msw/iniconf.h

index fb26aa58477592d34bef54fd03f8ac424d2d63d9..c8d2544d658923f98ba50ade1219ab25a411db12 100644 (file)
--- 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>
  // 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
  ///////////////////////////////////////////////////////////////////////////////
  
  #ifndef   _INICONF_H
diff --git a/include/wx/msw/joystick.h b/include/wx/msw/joystick.h

index aa97ff1252115afa4cf14b66fd8dcd0172febc55..4b15a0245e4de2ceef48a52a456d6d390772331e 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "joystick.h"
@@ -90,4 +90,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __JOYSTICKH__
+    // _WX_JOYSTICK_H_
diff --git a/include/wx/msw/listbox.h b/include/wx/msw/listbox.h

index ff26cefab5d9c113e8752e58d585a68cfdf16358..d8cf809003e4d44e763ec398ac1b0c55f3e3302d 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "listbox.h"
@@ -18,7 +18,6 @@
  
  #include "wx/control.h"
  
  
  #include "wx/control.h"
  
-WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
  WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
  
  #if USE_OWNER_DRAWN
  WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
  
  #if USE_OWNER_DRAWN
@@ -134,4 +133,4 @@ class WXDLLEXPORT wxListBox: public wxControl
  };
  
  #endif
  };
  
  #endif
-    // __LISTBOXH__
+    // _WX_LISTBOX_H_
diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h

index 95f7a899568ce125b70b21818e274ce0aec6df62..9f6693955b2ad9f49f39dae1c3820a504a438664 100644 (file)
--- 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$
  // 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"
  
  #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.
    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 ;
  
    // 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);
  
    // 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) ;
  
    // Ensures this item is visible
    bool EnsureVisible(long item) ;
@@ -426,7 +429,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
    char *AddPool(const wxString& str);
  
  protected:
    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)
    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
  #define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
  
  #endif
-    // __LISTCTRLH__
+    // _WX_LISTCTRL_H_
diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h

index a07466a196b8fd7a8eb92d1de2a427f2fad50fd8..658aa6c63d528da49c734879935b8fa15a012df7 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "mdi.h"
@@ -206,4 +206,4 @@ DECLARE_EVENT_TABLE()
  };
  
  #endif
  };
  
  #endif
-    // __MDIH__
+    // _WX_MDI_H_
diff --git a/include/wx/msw/menu.h b/include/wx/msw/menu.h

index 98049103baa8189e7117d659dd1171d632f32009..68f3f67d084ad61bfcd42eb81e05e097c67d3ffd 100644 (file)
--- a/include/wx/msw/menu.h
+++ b/include/wx/msw/menu.h
@@ -9,8 +9,8 @@
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:     wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __MENUH__
-#define __MENUH__
+#ifndef _WX_MENU_H_
+#define _WX_MENU_H_
  
  #ifdef __GNUG__
  #pragma interface "menu.h"
  
  #ifdef __GNUG__
  #pragma interface "menu.h"
@@ -19,9 +19,9 @@
  #include "wx/defs.h"
  #include "wx/event.h"
  
  #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;
  
  
  WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
  
@@ -125,7 +125,7 @@ public:
  // ----------------------------------------------------------------------------
  // Menu Bar (a la Windows)
  // ----------------------------------------------------------------------------
  // ----------------------------------------------------------------------------
  // Menu Bar (a la Windows)
  // ----------------------------------------------------------------------------
-class wxFrame;
+class WXDLLEXPORT wxFrame;
  class WXDLLEXPORT wxMenuBar: public wxEvtHandler
  {
    DECLARE_DYNAMIC_CLASS(wxMenuBar)
  class WXDLLEXPORT wxMenuBar: public wxEvtHandler
  {
    DECLARE_DYNAMIC_CLASS(wxMenuBar)
@@ -177,4 +177,4 @@ public:
    WXHMENU                   m_hMenu;
  };
  
    WXHMENU                   m_hMenu;
  };
  
-#endif // __MENUH__
+#endif // _WX_MENU_H_
diff --git a/include/wx/msw/metafile.h b/include/wx/msw/metafile.h

index c4c0665ed7eed960c1a65d6b4ff06690a5fade51..993e8738fa4f0017167626cc1315ce2540341ad6 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "metafile.h"
@@ -101,4 +101,4 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
  
  #endif // USE_METAFILE
  #endif
  
  #endif // USE_METAFILE
  #endif
-    // __METAFIILEH__
+    // _WX_METAFIILE_H_
diff --git a/include/wx/msw/minifram.h b/include/wx/msw/minifram.h

index 4bd21f182d6d64eab8f8ab3c6c2870153317280e..1debcd008230d2ff00e1623d64db2805725aef28 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "minifram.h"
@@ -43,4 +43,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __MINIFRAMH__
+    // _WX_MINIFRAM_H_
diff --git a/include/wx/msw/msgdlg.h b/include/wx/msw/msgdlg.h

index 27c10ef6e126dad5b98c9b1787024b07fb1580ba..51f7d0e39d4fec5a2d02c7d4a85d170b7e2387ba 100644 (file)
--- 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$
  // 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"
  
  #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
    wxWindow *parent = NULL, int x = -1, int y = -1);
  
  #endif
-    // __MSGBOXDLGH__
+    // _WX_MSGBOXDLG_H_
diff --git a/include/wx/msw/ole/dataobj.h b/include/wx/msw/ole/dataobj.h

index 23b6141f24053d587804006a9cde42596a3fac45..245c4db718768950b059a145a6a391a39e12e652 100644 (file)
--- 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>
  // 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
  
  // ----------------------------------------------------------------------------
  // forward declarations
@@ -106,4 +106,4 @@ private:
  // @@@ TODO: wx{Bitmap|Metafile|...}DataObject
  // ----------------------------------------------------------------------------
  
  // @@@ TODO: wx{Bitmap|Metafile|...}DataObject
  // ----------------------------------------------------------------------------
  
-#endif  //_OLEDATAOBJ_H
+#endif  //_WX_OLEDATAOBJ_H
diff --git a/include/wx/msw/ole/dropsrc.h b/include/wx/msw/ole/dropsrc.h

index 4630de728d04a2656d8271acaa25e11b328e3932..e711c428cacab0bc17c7ee236399f4534a0f0df2 100644 (file)
--- 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>
  // 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
  
  #ifdef __GNUG__
  #pragma interface
@@ -68,4 +68,4 @@ private:
    wxIDropSource *m_pIDropSource;  // the pointer to COM interface
  };
  
    wxIDropSource *m_pIDropSource;  // the pointer to COM interface
  };
  
-#endif  //_OLEDROPSRC_H
-\ No newline at end of file
+#endif  //_WX_OLEDROPSRC_H
+\ No newline at end of file
diff --git a/include/wx/msw/ole/droptgt.h b/include/wx/msw/ole/droptgt.h

index cd9fbacfa6f2f65242bf875f6871515fe45e82f9..cf990ef5a0f558d124e0ba6ad9fea55023471e5e 100644 (file)
--- 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>
  // Created:     06.03.98
  // RCS-ID:      $Id$
  // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
  ///////////////////////////////////////////////////////////////////////////////
  
  // ============================================================================
  // prolog
  // ============================================================================
  ///////////////////////////////////////////////////////////////////////////////
  
  // ============================================================================
  // prolog
  // ============================================================================
-#ifndef   _OLEDROPTGT_H
-#define   _OLEDROPTGT_H
+#ifndef   _WX_OLEDROPTGT_H
+#define   _WX_OLEDROPTGT_H
  
  #ifdef __GNUG__
  #pragma interface "droptgt.h"
  
  #ifdef __GNUG__
  #pragma interface "droptgt.h"
@@ -108,4 +108,4 @@ protected:
  };
  
  // ============================================================================
  };
  
  // ============================================================================
-#endif  //_OLEDROPTGT_H
+#endif  //_WX_OLEDROPTGT_H
diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h

index 60336d64441bfb02b897a1571948f779aacfc570..2335dd5468df969b2f9f894ea07a2777ddcc7408 100644 (file)
--- 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>
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "oleutils.h"
@@ -143,4 +143,4 @@ void wxLogRelease(const char *szInterface, ULONG cRef);
    #define   wxLogRelease(szInterface, cRef)
  #endif  //WXDEBUG
  
    #define   wxLogRelease(szInterface, cRef)
  #endif  //WXDEBUG
  
-#endif  //_OLEUTILS_H
-\ No newline at end of file
+#endif  //_WX_OLEUTILS_H
+\ No newline at end of file
diff --git a/include/wx/msw/ole/uuid.h b/include/wx/msw/ole/uuid.h

index 211ce71f5edec49c175b1b0adce4591cc5e1fdf1..4da624b09ee66d4c03ad61ffa930366c1389aea0 100644 (file)
--- 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>
  // 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!
  ///////////////////////////////////////////////////////////////////////////////
  
  //
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "uuid.h"
@@ -88,4 +88,4 @@ public:
    const char *CForm() const    { return m_pszCForm;          }
  };
  
    const char *CForm() const    { return m_pszCForm;          }
  };
  
-#endif //_OLEUUID_H
-\ No newline at end of file
+#endif //_WX_OLEUUID_H
+\ No newline at end of file
diff --git a/include/wx/msw/palette.h b/include/wx/msw/palette.h

index f7dffc57b0d2fa752963f8ba265a97ee05817462..510882fa18cc58420e50d5e29983da63309d47c4 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "palette.h"
@@ -63,4 +63,4 @@ public:
  #define wxColourMap wxPalette
  
  #endif
  #define wxColourMap wxPalette
  
  #endif
-    // __PALETTEH__
+    // _WX_PALETTE_H_
diff --git a/include/wx/msw/pen.h b/include/wx/msw/pen.h

index 7f2b8491abe0bc92e1a2e3a1b8ef0e127930ba35..5bf73b0205ae2284c94337fbbb65a95de3e05023 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "pen.h"
@@ -95,4 +95,4 @@ public:
  int wx2msPenStyle(int wx_style);
  
  #endif
  int wx2msPenStyle(int wx_style);
  
  #endif
-    // __PENH__
+    // _WX_PEN_H_
diff --git a/include/wx/msw/pnghand.h b/include/wx/msw/pnghand.h

index 2b588b35ff151ae71b8385e3fa046cd87f9b36bf..3fb34992fe8fbd8008a3a777adaf4340eb60c696 100644 (file)
--- 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
  // Created:     04/01/98
  // RCS-ID:      $Id$
  // Copyright:   (c) Microsoft, Julian Smart
-// Licence:    wxWindows license
+// Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
  #ifdef __GNUG__
  /////////////////////////////////////////////////////////////////////////////
  
  #ifdef __GNUG__
diff --git a/include/wx/msw/pngread.h b/include/wx/msw/pngread.h

index ed6cc8fa78e50a76bef3440688db1e8a8e4c2f93..637904521ab94e7bc7be032e7b5ac94df38442bf 100644 (file)
--- 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"
  
  #ifdef __GNUG__
  #pragma interface "pngread.h"
diff --git a/include/wx/msw/printdlg.h b/include/wx/msw/printdlg.h

index ba5af57c5e1e7e9bc6d79c00587eee5d06221c7d..cf14ef75b037e81f8b071ac2365ae122bc043e17 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "printdlg.h"
@@ -68,4 +68,4 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
  };
  
  #endif
  };
  
  #endif
-    // __PRINTDLGH__
+    // _WX_PRINTDLG_H_
diff --git a/include/wx/msw/printwin.h b/include/wx/msw/printwin.h

index 6ba0aa6a72beff055e33469057a7b20333a92f24..075c34b472113232b031cea7aa7c623478dad2b9 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "printwin.h"
@@ -55,4 +55,4 @@ class WXDLLEXPORT wxWindowsPrintPreview: public wxPrintPreviewBase
  };
  
  #endif
  };
  
  #endif
-    // __PRINTWINH__
+    // _WX_PRINTWIN_H_
diff --git a/include/wx/msw/private.h b/include/wx/msw/private.h

index 6fb4b4af7f6d89070edd7f6083d748753f2e035e..c764c5641fb981b29cd6d53115b7a5f784a30522 100644 (file)
--- 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$
  // 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"
  
  
  #include "wx/defs.h"
  
@@ -152,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
  #endif
  
  #endif
  #endif
  
  #endif
-    // __PRIVATEH__
+    // _WX_PRIVATE_H_
diff --git a/include/wx/msw/radiobox.h b/include/wx/msw/radiobox.h

index 5cb2077a646e088f225bd514bc76b55fa44f4eb7..e0dde6b58b0ddbbadcf32367966987c178aedcb5 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "radiobox.h"
@@ -134,4 +134,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __RADIOBOXH__
+    // _WX_RADIOBOX_H_
diff --git a/include/wx/msw/radiobut.h b/include/wx/msw/radiobut.h

index 8307f8b1f2d413dff9babbfef7f3277c3729eed2..a2514e757474b4403c78461c723f0dea3fb2e181 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "radiobut.h"
@@ -89,4 +89,4 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
  #endif
  
  #endif
  #endif
  
  #endif
-    // __RADIOBUTH__
+    // _WX_RADIOBUT_H_
diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h

index 67ff6f470087e60e828def7694820b83fa8276f1..5f74de0751d907b7c7e454866ce9c367e19489e8 100644 (file)
--- 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>
  // 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
  ///////////////////////////////////////////////////////////////////////////////
  
  #ifndef   _REGCONF_H
diff --git a/include/wx/msw/region.h b/include/wx/msw/region.h

index f0c9cfbcb2d3c2a5410d8194d3e24f0fab7ec5a9..0ac45586ec450220bb15f7a9995d7754fbc8f2cc 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "region.h"
@@ -134,4 +134,4 @@ private:
  };
  
  #endif
  };
  
  #endif
-       // __REGIONH__
+       // _WX_REGION_H_
diff --git a/include/wx/msw/registry.h b/include/wx/msw/registry.h

index e63bffb607ff2eb88ebb39cac8a43b9537fc5df9..1d831982c5dde5aea301881848ae0da1bad1cca9 100644 (file)
--- 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>
  // 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
  ///////////////////////////////////////////////////////////////////////////////
  
  #ifndef   _REGISTRY_H
diff --git a/include/wx/msw/scrolbar.h b/include/wx/msw/scrolbar.h

index 2ef6b9a55ce0d07869e44927083e90fc53febe87..cf461ecd593772d0031cb8e2798d80ae4def4f51 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "scrolbar.h"
@@ -88,4 +88,4 @@ DECLARE_EVENT_TABLE()
  };
  
  #endif
  };
  
  #endif
-    // __SCROLBARH__
+    // _WX_SCROLBAR_H_
diff --git a/include/wx/msw/settings.h b/include/wx/msw/settings.h

index 08f1e64e8e5b3e49d5ff087f653cf356ea5a5911..2df189e9ae0e7d7175773bc9f9d994d1871723f8 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "settings.h"
@@ -126,4 +126,4 @@ public:
  };
  
  #endif
  };
  
  #endif
-    // __SETTINGSH__
+    // _WX_SETTINGS_H_
diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h

index 2d472aed3456c85ab607d684826a06617c75748d..85ff39009bad5bc63fae9fa9873d411edf1dbe63 100644 (file)
--- 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$
  // 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
  
  /*
   * General features
@@ -19,7 +19,7 @@
  
  #define USE_CONFIG           1
                                  // Use wxConfig, with CreateConfig in wxApp
  
  #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
                                  // gcc can have problems, but Windows compilers
                                  // are generally OK.
  #define WXWIN_COMPATIBILITY  1
@@ -328,4 +328,4 @@
  #endif
  
  #endif
  #endif
  
  #endif
-    // __SETUPH__
+    // _WX_SETUP_H_
diff --git a/include/wx/msw/slider.h b/include/wx/msw/slider.h

index 3ac84b5342d7fa702ca419de2eb30f7dc03196b5..07ae35865836c42c82ccd7dc8554f450ecd16239 100644 (file)
--- 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$
  // 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_
  /////////////////////////////////////////////////////////////////////////////
  
  #ifndef _SLIDER_H_
diff --git a/include/wx/msw/slider95.h b/include/wx/msw/slider95.h

index 445d8f3da54ff885322dbffebb1f7d7b616d3946..ed8c6523c3b0e14088e1d717fd5efb6a1c850b85 100644 (file)
--- 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$
  // 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_
  /////////////////////////////////////////////////////////////////////////////
  
  #ifndef _SLIDER95_H_
diff --git a/include/wx/msw/slidrmsw.h b/include/wx/msw/slidrmsw.h

index afeebafcfb5d2cfb842d8edb0f851ee8b25cfc73..8384086d1eed97827d4725102f3e483248cde557 100644 (file)
--- 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$
  // 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_
  /////////////////////////////////////////////////////////////////////////////
  
  #ifndef _SLIDRMSW_H_
diff --git a/include/wx/msw/spinbutt.h b/include/wx/msw/spinbutt.h

index 4c1aa7b1c96d7ba5ebc5cb4bb722ccd22038b59f..31e2b9dbf07ac46313348ae05baa419ad3470fc1 100644 (file)
--- 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$
  // 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"
  
  #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
    { wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
  
  #endif
-    // __WIN95__
+    // _WX_WIN95__
  #endif
  #endif
-    // __SPINBUTTH__
+    // _WX_SPINBUTT_H_
diff --git a/include/wx/msw/statbmp.h b/include/wx/msw/statbmp.h

index 3a5fd03e743dea17ee8d464386999953b024b6cf..b6aca08bb1496af6f16878f73c2d1bd361991d0b 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "statbmp.h"
@@ -64,4 +64,4 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
  };
  
  #endif
  };
  
  #endif
-    // __STATBMPH__
+    // _WX_STATBMP_H_
diff --git a/include/wx/msw/statbox.h b/include/wx/msw/statbox.h

index e1970721ae05c13c99f532a5f558141097b0951f..97e3722a703dc10386ab5bbe8c6e81bb598ad13f 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "statbox.h"
@@ -60,4 +60,4 @@ DECLARE_EVENT_TABLE()
  };
  
  #endif
  };
  
  #endif
-    // __STATBOXH__
+    // _WX_STATBOX_H_
diff --git a/include/wx/msw/statbr95.h b/include/wx/msw/statbr95.h

index 1b8bd8d8b6a8266b07a2b00c55fcd26a119a9927..4950dd85b80565c38f95ccc8b4f57a2af59e235a 100644 (file)
--- 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>
  // 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
  ///////////////////////////////////////////////////////////////////////////////
  
  #ifndef   _STATBR95_H
diff --git a/include/wx/msw/stattext.h b/include/wx/msw/stattext.h

index 8dd0bcb76f5779a360b102f4b8154b711648676c..dbb3646a0a6e375b9c2dd2020dac0eb1c60a25d1 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "stattext.h"
@@ -61,4 +61,4 @@ class WXDLLEXPORT wxStaticText: public wxControl
  };
  
  #endif
  };
  
  #endif
-    // __STATTEXTH__
+    // _WX_STATTEXT_H_
diff --git a/include/wx/msw/tabctrl.h b/include/wx/msw/tabctrl.h

index b5c076eb7f46ce0daa65babb93319c6e02d26d1b..798c61b32285cb61f9d5aa2f30701c0f4d434ec0 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "tabctrl.h"
@@ -150,4 +150,4 @@ typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
    id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
  
  #endif
    id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
  
  #endif
-    // __TABCTRLH__
+    // _WX_TABCTRL_H_
diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h

index cf7473f1dda17e8e012d1350825219b7854e8799..404e21f0fc9ff7d897d9ea6bf1c3e1d9a0941316 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "tbar95.h"
@@ -93,4 +93,4 @@ DECLARE_EVENT_TABLE()
  
  #endif // USE_TOOL/BUTTONBAR
  #endif
  
  #endif // USE_TOOL/BUTTONBAR
  #endif
-    // __TBAR95H__
+    // _WX_TBAR95_H_
diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h

index 82201b78d8f1bc037e206d331133866bbafd15cf..f39ee7bd71118f9e1537668864590084445e5a56 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "tbarmsw.h"
@@ -120,4 +120,4 @@ DECLARE_EVENT_TABLE()
  
  #endif // USE_TOOL/BUTTONBAR
  #endif
  
  #endif // USE_TOOL/BUTTONBAR
  #endif
-    // __TBARMSWH__
+    // _WX_TBARMSW_H_
diff --git a/include/wx/msw/textctrl.h b/include/wx/msw/textctrl.h

index 23e3e12f7c50a2a864628780782e94b4dc97c974..1e8e351f0249863720b8abf01e6d4ed954e48689 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "textctrl.h"
@@ -153,4 +153,4 @@ protected:
  };
  
  #endif
  };
  
  #endif
-    // __TEXTCTRLH__
+    // _WX_TEXTCTRL_H_
diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h

index a6e6d4d3f8d60db6c0c69aded0b80c433fe243f2..42287be447cc1a645c50323944a37588b4a6c7f6 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "timer.h"
@@ -49,4 +49,4 @@ bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
  long WXDLLEXPORT wxGetCurrentTime(void);
  
  #endif
  long WXDLLEXPORT wxGetCurrentTime(void);
  
  #endif
-    // __TIMERH_
+    // _WX_TIMERH_
diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h

index 4f716a9d13649c947f930530e94e63c0d8015e5f..24eb312a817d0937c798dea79c6ab68dc09e297c 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -9,8 +9,8 @@
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows license
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __TREECTRLH__
-#define __TREECTRLH__
+#ifndef _WX_TREECTRL_H_
+#define _WX_TREECTRL_H_
  
  #ifdef __GNUG__
  #pragma interface "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;
        //
        // bounding rect
      bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
        //
-    wxTextCtrl& GetEditControl() const;
+    wxTextCtrl* GetEditControl() const;
      
      // operations
      // ----------
      
      // operations
      // ----------
@@ -217,7 +217,13 @@ public:
      bool SelectItem(long item);
      bool ScrollTo(long item);
      bool DeleteAllItems();
      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);
      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:
      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)
  };
  
      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
  #define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
  
  #endif
-    // __TREECTRLH__
+    // _WX_TREECTRL_H_
diff --git a/include/wx/msw/wave.h b/include/wx/msw/wave.h

index 344fc7ced52019217fd29b97420fd08c88d2fd60..ce7e14fbe43137aed2ca6baa8478491481365d40 100644 (file)
--- 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$
  // 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"
  
  #ifdef __GNUG__
  #pragma interface "wave.h"
diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h

index 4200fbeaa4b8abb251eee596c223c4754eedc0c4..1ab4f69b508cc2dca8dc583f023c592c76c21f8a 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -9,8 +9,8 @@
  // Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
  // Licence:    wxWindows licence
  /////////////////////////////////////////////////////////////////////////////
  
-#ifndef __WINDOWH__
-#define __WINDOWH__
+#ifndef _WX_WINDOW_H_
+#define _WX_WINDOW_H_
  
  #ifdef __GNUG__
  #pragma interface "window.h"
  
  #ifdef __GNUG__
  #pragma interface "window.h"
@@ -84,7 +84,6 @@ class WXDLLEXPORT wxWindow: public wxEvtHandler
  {
    DECLARE_ABSTRACT_CLASS(wxWindow)
  
  {
    DECLARE_ABSTRACT_CLASS(wxWindow)
  
-  friend class wxUpdateIterator;
    friend class wxDC;
    friend class wxPaintDC;
  
    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
    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;
    // 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);
  
  // 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);
  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
  int WXDLLEXPORT NewControlId(void);
  
  #endif
-    // __WINDOWH__
+    // _WX_WINDOW_H_
diff --git a/src/common/resource.cpp b/src/common/resource.cpp

index 0aeb411e1898553a2c6a6df228f2b058bc041e07..e2196354b9830885649b3d93d71de9f2b28c4d95 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -672,6 +672,10 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex
    expr->AssignAttributeValue("label_colour", &labelColourHex);
    expr->AssignAttributeValue("button_colour", &buttonColourHex);
  
    expr->AssignAttributeValue("label_colour", &labelColourHex);
    expr->AssignAttributeValue("button_colour", &buttonColourHex);
  
+  long id = 0;
+  expr->GetAttributeValue("id", id);
+  dialogItem->SetId(id);
+
    if (style)
    {
      windowStyle = wxParseWindowStyle(style);
    if (style)
    {
      windowStyle = wxParseWindowStyle(style);
@@ -1845,6 +1849,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
    /* wxTreeCtrl */
    { "wxTR_HAS_BUTTONS", wxTR_HAS_BUTTONS },
    { "wxTR_EDIT_LABELS", wxTR_EDIT_LABELS },
    /* wxTreeCtrl */
    { "wxTR_HAS_BUTTONS", wxTR_HAS_BUTTONS },
    { "wxTR_EDIT_LABELS", wxTR_EDIT_LABELS },
+  { "wxTR_LINES_AT_ROOT", wxTR_LINES_AT_ROOT },
  
    /* wxListCtrl */
    { "wxLC_ICON", wxLC_ICON },
  
    /* wxListCtrl */
    { "wxLC_ICON", wxLC_ICON },
@@ -1892,6 +1897,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
    
    /* wxToolBar */
    { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
    
    /* wxToolBar */
    { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
+  { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
+  { "wxTB_VERTICAL", wxTB_VERTICAL},
+  { "wxTB_FLAT", wxTB_FLAT},
  
    /* Generic */
    { "wxVSCROLL", wxVSCROLL },
  
    /* Generic */
    { "wxVSCROLL", wxVSCROLL },
@@ -2907,6 +2915,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
         long modalStyle = isModal ? wxDIALOG_MODAL : 0;
      if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
        return FALSE;
         long modalStyle = isModal ? wxDIALOG_MODAL : 0;
      if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
        return FALSE;
+    dialogBox->SetClientSize(width, height);
    }
    else
    {
    }
    else
    {
diff --git a/src/msw/app.cpp b/src/msw/app.cpp

index f2364971079f3e9993e8da8074f8758c8395bdf3..5001e5443029544926abd4104af4250208470ff5 100644 (file)
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -53,9 +53,11 @@
  #endif
  
  // use debug CRT functions for memory leak detections in VC++
  #endif
  
  // use debug CRT functions for memory leak detections in VC++
+/* THIS CRAPS OUT in VC++ 5.
  #if defined(__WXDEBUG__) && defined(_MSC_VER)
    #include <crtdbg.h>
  #endif
  #if defined(__WXDEBUG__) && defined(_MSC_VER)
    #include <crtdbg.h>
  #endif
+*/
  
  extern char *wxBuffer;
  extern char *wxOsVersion;
  
  extern char *wxBuffer;
  extern char *wxOsVersion;
@@ -430,12 +432,15 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_
  {
    wxhInstance = (HINSTANCE) hInstance;
  
  {
    wxhInstance = (HINSTANCE) hInstance;
  
+/* No, sorry, whatever this is, forget it. Doesn't work with VC++ 5.
+
    #if defined(__WXDEBUG__) && defined(_MSC_VER)
      // do check for memory leaks on program exit
      // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
      //  deallocated memory which may be used to simulate low-memory condition)
      _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
    #endif // debug build under MS VC++
    #if defined(__WXDEBUG__) && defined(_MSC_VER)
      // do check for memory leaks on program exit
      // (another useful flag is _CRTDBG_DELAY_FREE_MEM_DF which doesn't free
      //  deallocated memory which may be used to simulate low-memory condition)
      _CrtSetDbgFlag(_CrtSetDbgFlag(_CRTDBG_REPORT_FLAG) | _CRTDBG_LEAK_CHECK_DF);
    #endif // debug build under MS VC++
+*/
  
  #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
  
  
  #if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT
  
diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp

index 18949f021295347dcc28a402b5da91125716b5e4..2945076d06597fdb53d1a98224d17e05632c3c1b 100644 (file)
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -58,7 +58,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
    if (parent) parent->AddChild(this);
    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
    if (parent) parent->AddChild(this);
    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-  no_strings = n;
+  m_noStrings = n;
  
    m_windowStyle = style;
  
  
    m_windowStyle = style;
  
@@ -121,19 +121,19 @@ void wxChoice::Append(const wxString& item)
  {
    SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
  
  {
    SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
  
-  no_strings ++;
+  m_noStrings ++;
  }
  
  void wxChoice::Delete(int n)
  {
  }
  
  void wxChoice::Delete(int n)
  {
-  no_strings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
+  m_noStrings = (int)SendMessage((HWND) GetHWND(), CB_DELETESTRING, n, 0);
  }
  
  void wxChoice::Clear(void)
  {
    SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0);
  
  }
  
  void wxChoice::Clear(void)
  {
    SendMessage((HWND) GetHWND(), CB_RESETCONTENT, 0, 0);
  
-  no_strings = 0;
+  m_noStrings = 0;
  }
  
  
  }
  
  
@@ -218,14 +218,14 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
    if (width <= 0)
    {
      // Find the longest string
    if (width <= 0)
    {
      // Find the longest string
-    if (no_strings == 0)
+    if (m_noStrings == 0)
        control_width = (float)100.0;
      else
      {
        int len, ht;
        float longest = (float)0.0;
        int i;
        control_width = (float)100.0;
      else
      {
        int len, ht;
        float longest = (float)0.0;
        int i;
-      for (i = 0; i < no_strings; i++)
+      for (i = 0; i < m_noStrings; i++)
        {
          wxString str(GetString(i));
          GetTextExtent(str, &len, &ht, NULL, NULL,GetFont());
        {
          wxString str(GetString(i));
          GetTextExtent(str, &len, &ht, NULL, NULL,GetFont());
@@ -239,9 +239,9 @@ void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
    // Choice drop-down list depends on number of items (limited to 10)
    if (h1 <= 0)
    {
    // Choice drop-down list depends on number of items (limited to 10)
    if (h1 <= 0)
    {
-    if (no_strings == 0)
+    if (m_noStrings == 0)
        h1 = (int)(EDIT_CONTROL_FACTOR*cy*10.0);
        h1 = (int)(EDIT_CONTROL_FACTOR*cy*10.0);
-    else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, no_strings) + 1));
+    else h1 = (int)(EDIT_CONTROL_FACTOR*cy*(wxMin(10, m_noStrings) + 1));
    }
  
    // If non-default width...
    }
  
    // If non-default width...
diff --git a/src/msw/colordlg.cpp b/src/msw/colordlg.cpp

index e18bb2af6bd66f5487fcbc0b97d8523eacc758cf..df7bd24b0b1b5d36cb9fb4ecfa6017ffb9241b27 100644 (file)
--- a/src/msw/colordlg.cpp
+++ b/src/msw/colordlg.cpp
@@ -59,7 +59,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
  
  wxColourDialog::wxColourDialog(void)
  {
  
  wxColourDialog::wxColourDialog(void)
  {
-  dialogParent = NULL;
+  m_dialogParent = NULL;
  }
  
  wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
  }
  
  wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
@@ -69,10 +69,10 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
  
  bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
  {
  
  bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
  {
-  dialogParent = parent;
-  
+  m_dialogParent = parent;
+
    if (data)
    if (data)
-    colourData = *data;
+    m_colourData = *data;
    return TRUE;
  }
  
    return TRUE;
  }
  
@@ -84,16 +84,16 @@ int wxColourDialog::ShowModal(void)
  
      int i;
      for (i = 0; i < 16; i++)
  
      int i;
      for (i = 0; i < 16; i++)
-      custColours[i] = RGB(colourData.custColours[i].Red(), colourData.custColours[i].Green(), colourData.custColours[i].Blue());
+      custColours[i] = RGB(m_colourData.custColours[i].Red(), m_colourData.custColours[i].Green(), m_colourData.custColours[i].Blue());
  
      chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
  
      chooseColorStruct.lStructSize = sizeof(CHOOSECOLOR);
-    chooseColorStruct.hwndOwner = (HWND) (dialogParent ? (HWND) dialogParent->GetHWND() : NULL);
-    chooseColorStruct.rgbResult = RGB(colourData.dataColour.Red(), colourData.dataColour.Green(), colourData.dataColour.Blue());
+    chooseColorStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : NULL);
+    chooseColorStruct.rgbResult = RGB(m_colourData.dataColour.Red(), m_colourData.dataColour.Green(), m_colourData.dataColour.Blue());
      chooseColorStruct.lpCustColors = custColours;
  
      chooseColorStruct.Flags = CC_RGBINIT;
  
      chooseColorStruct.lpCustColors = custColours;
  
      chooseColorStruct.Flags = CC_RGBINIT;
  
-    if (!colourData.GetChooseFull())
+    if (!m_colourData.GetChooseFull())
        chooseColorStruct.Flags |= CC_PREVENTFULLOPEN;
  
      // Do the modal dialog
        chooseColorStruct.Flags |= CC_PREVENTFULLOPEN;
  
      // Do the modal dialog
@@ -112,11 +112,11 @@ int wxColourDialog::ShowModal(void)
      // Restore values
      for (i = 0; i < 16; i++)
      {
      // Restore values
      for (i = 0; i < 16; i++)
      {
-      colourData.custColours[i].Set(GetRValue(custColours[i]), GetGValue(custColours[i]),
+      m_colourData.custColours[i].Set(GetRValue(custColours[i]), GetGValue(custColours[i]),
           GetBValue(custColours[i]));
      }
  
           GetBValue(custColours[i]));
      }
  
-    colourData.dataColour.Set(GetRValue(chooseColorStruct.rgbResult), GetGValue(chooseColorStruct.rgbResult),
+    m_colourData.dataColour.Set(GetRValue(chooseColorStruct.rgbResult), GetGValue(chooseColorStruct.rgbResult),
       GetBValue(chooseColorStruct.rgbResult));
  
      return success ? wxID_OK : wxID_CANCEL;
       GetBValue(chooseColorStruct.rgbResult));
  
      return success ? wxID_OK : wxID_CANCEL;
diff --git a/src/msw/combobox.cpp b/src/msw/combobox.cpp

index b53e3125777cf7b19918849737990f40946f2696..146d1bd5a70113a9c3fdd867c30ed9448004ef45 100644 (file)
--- a/src/msw/combobox.cpp
+++ b/src/msw/combobox.cpp
@@ -71,7 +71,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
    if (parent) parent->AddChild(this);
    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
    if (parent) parent->AddChild(this);
    SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
    SetForegroundColour(parent->GetDefaultForegroundColour()) ;
-  no_strings = n;
+  m_noStrings = n;
  
    m_windowStyle = style;
  
  
    m_windowStyle = style;
  
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp

index 59f74d78c3edb12c16ae30e4cec73255db066209..4c8cbcbae703bdc7bdd652edd0cec27c7a859156 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -59,7 +59,7 @@ END_EVENT_TABLE()
  
  long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
  
  long wxDialog::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
-  return ::CallWindowProc((FARPROC)m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+  return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
  }
  
  bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
  }
  
  bool wxDialog::MSWProcessMessage(WXMSG* pMsg)
diff --git a/src/msw/fontdlg.cpp b/src/msw/fontdlg.cpp

index 0e335774d207de536c8e059ed47e4ec7f76a5c83..d2c23a9d410b806d9958e65a71e2ee8d0687f3f9 100644 (file)
--- a/src/msw/fontdlg.cpp
+++ b/src/msw/fontdlg.cpp
@@ -56,7 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
  
  wxFontDialog::wxFontDialog(void)
  {
  
  wxFontDialog::wxFontDialog(void)
  {
-  dialogParent = NULL;
+  m_dialogParent = NULL;
  }
  
  wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
  }
  
  wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
@@ -66,10 +66,10 @@ wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
  
  bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
  {
  
  bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
  {
-  dialogParent = parent;
-  
+  m_dialogParent = parent;
+
    if (data)
    if (data)
-    fontData = *data;
+    m_fontData = *data;
    return TRUE;
  }
  
    return TRUE;
  }
  
@@ -83,28 +83,28 @@ int wxFontDialog::ShowModal(void)
      memset(&chooseFontStruct, 0, sizeof(CHOOSEFONT));
  
      chooseFontStruct.lStructSize = sizeof(CHOOSEFONT);
      memset(&chooseFontStruct, 0, sizeof(CHOOSEFONT));
  
      chooseFontStruct.lStructSize = sizeof(CHOOSEFONT);
-    chooseFontStruct.hwndOwner = (HWND) (dialogParent ? (HWND) dialogParent->GetHWND() : NULL);
+    chooseFontStruct.hwndOwner = (HWND) (m_dialogParent ? (HWND) m_dialogParent->GetHWND() : NULL);
      chooseFontStruct.lpLogFont = &logFont;
  
      chooseFontStruct.lpLogFont = &logFont;
  
-    if (fontData.initialFont.Ok())
+    if (m_fontData.initialFont.Ok())
      {
        flags |= CF_INITTOLOGFONTSTRUCT;
      {
        flags |= CF_INITTOLOGFONTSTRUCT;
-      wxFillLogFont(&logFont, & fontData.initialFont);
+      wxFillLogFont(&logFont, & m_fontData.initialFont);
      }
  
      chooseFontStruct.iPointSize = 0;
      }
  
      chooseFontStruct.iPointSize = 0;
-    chooseFontStruct.rgbColors = RGB((BYTE)fontData.fontColour.Red(), (BYTE)fontData.fontColour.Green(), (BYTE)fontData.fontColour.Blue());
+    chooseFontStruct.rgbColors = RGB((BYTE)m_fontData.fontColour.Red(), (BYTE)m_fontData.fontColour.Green(), (BYTE)m_fontData.fontColour.Blue());
  
  
-    if (!fontData.GetAllowSymbols())
+    if (!m_fontData.GetAllowSymbols())
        flags |= CF_ANSIONLY;
        flags |= CF_ANSIONLY;
-    if (fontData.GetEnableEffects())
+    if (m_fontData.GetEnableEffects())
        flags |= CF_EFFECTS;
        flags |= CF_EFFECTS;
-    if (fontData.GetShowHelp())
+    if (m_fontData.GetShowHelp())
        flags |= CF_SHOWHELP;
        flags |= CF_SHOWHELP;
-    if (!(fontData.minSize == 0 && fontData.maxSize == 0))
+    if (!(m_fontData.minSize == 0 && m_fontData.maxSize == 0))
      {
      {
-      chooseFontStruct.nSizeMin = fontData.minSize;
-      chooseFontStruct.nSizeMax = fontData.maxSize;
+      chooseFontStruct.nSizeMin = m_fontData.minSize;
+      chooseFontStruct.nSizeMax = m_fontData.maxSize;
        flags |= CF_LIMITSIZE;
      }
  
        flags |= CF_LIMITSIZE;
      }
  
@@ -115,9 +115,9 @@ int wxFontDialog::ShowModal(void)
      // Restore values
      if (success)
      {
      // Restore values
      if (success)
      {
-      fontData.fontColour.Set(GetRValue(chooseFontStruct.rgbColors), GetGValue(chooseFontStruct.rgbColors),
+      m_fontData.fontColour.Set(GetRValue(chooseFontStruct.rgbColors), GetGValue(chooseFontStruct.rgbColors),
         GetBValue(chooseFontStruct.rgbColors));
         GetBValue(chooseFontStruct.rgbColors));
-      fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
+      m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
      }
  
      return success ? wxID_OK : wxID_CANCEL;
      }
  
      return success ? wxID_OK : wxID_CANCEL;
diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp

index e595d659964a476ceda110d4d9f1ab4caac41590..2862f2477575d521de8928f561e06b68eeb18a17 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -54,6 +54,7 @@ wxListCtrl::wxListCtrl(void)
         m_imageListState = NULL;
         m_baseStyle = 0;
      m_colCount = 0;
         m_imageListState = NULL;
         m_baseStyle = 0;
      m_colCount = 0;
+    m_textCtrl = NULL;
  }
  
  bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
  }
  
  bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
@@ -62,6 +63,7 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
    m_imageListNormal = NULL;
    m_imageListSmall = NULL;
    m_imageListState = NULL;
    m_imageListNormal = NULL;
    m_imageListSmall = NULL;
    m_imageListState = NULL;
+  m_textCtrl = NULL;
    m_colCount = 0;
  
    wxSystemSettings settings;
    m_colCount = 0;
  
    wxSystemSettings settings;
@@ -129,7 +131,13 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
  
  wxListCtrl::~wxListCtrl(void)
  {
  
  wxListCtrl::~wxListCtrl(void)
  {
-       m_textCtrl.SetHWND((WXHWND) NULL);
+    if (m_textCtrl)
+    {
+      m_textCtrl->UnsubclassWin();
+      m_textCtrl->SetHWND(0);
+      delete m_textCtrl;
+      m_textCtrl = NULL;
+    }
  }
  
  // Add or remove a single window style
  }
  
  // Add or remove a single window style
@@ -441,11 +449,9 @@ int wxListCtrl::GetCountPerPage(void) const
  }
  
  // Gets the edit control for editing labels.
  }
  
  // Gets the edit control for editing labels.
-wxTextCtrl& wxListCtrl::GetEditControl(void) const
+wxTextCtrl* wxListCtrl::GetEditControl(void) const
  {
  {
-       HWND hWnd = (HWND) ListView_GetEditControl((HWND) GetHWND());
-       ((wxListCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
-       return (wxTextCtrl&)m_textCtrl;
+    return m_textCtrl;
  }
  
  // Gets information about the item
  }
  
  // Gets information about the item
@@ -806,14 +812,49 @@ void wxListCtrl::ClearAll(void)
          DeleteAllColumns();
  }
  
          DeleteAllColumns();
  }
  
-// Edits a label
-wxTextCtrl& wxListCtrl::Edit(long item)
+wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
+{
+    wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
+
+    HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), item);
+
+    if (m_textCtrl)
+    {
+      m_textCtrl->UnsubclassWin();
+      m_textCtrl->SetHWND(0);
+      delete m_textCtrl;
+      m_textCtrl = NULL;
+    }
+
+    m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject();
+    m_textCtrl->SetHWND((WXHWND) hWnd);
+    m_textCtrl->SubclassWin((WXHWND) hWnd);
+
+    return m_textCtrl;
+}
+
+// End label editing, optionally cancelling the edit
+bool wxListCtrl::EndEditLabel(bool cancel)
  {
  {
-       HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), (int) item);
-       m_textCtrl.SetHWND((WXHWND) hWnd);
-       return m_textCtrl;
+    wxASSERT( FALSE);
+
+/* I don't know how to implement this: there's no such macro as ListView_EndEditLabelNow.
+ * ???
+    bool success = (ListView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0);
+
+    if (m_textCtrl)
+    {
+      m_textCtrl->UnsubclassWin();
+      m_textCtrl->SetHWND(0);
+      delete m_textCtrl;
+      m_textCtrl = NULL;
+    }
+    return success;
+*/
+  return FALSE;
  }
  
  }
  
+
  // Ensures this item is visible
  bool wxListCtrl::EnsureVisible(long item)
  {
  // Ensures this item is visible
  bool wxListCtrl::EnsureVisible(long item)
  {
diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp

index e1a6b0d58770ba8177c8133f704a25e7768c4cd9..fdb27c0822bcc8fb45fbe7b45dcad3754945a983 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1223,7 +1223,7 @@ long wxMDIClientWindow::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa
  long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
         if ( MSWGetOldWndProc() != 0)
  long wxMDIClientWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
         if ( MSWGetOldWndProc() != 0)
-               return ::CallWindowProc((FARPROC)MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+               return ::CallWindowProc(CASTWNDPROC MSWGetOldWndProc(), (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
         else
                 return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
  }
         else
                 return ::DefWindowProc((HWND) m_hWnd, (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
  }
diff --git a/src/msw/minifram.cpp b/src/msw/minifram.cpp

index d792e4ec4a32caa7f70a9e4c3ead1df95ea5c511..346e95d9b9ac73296415683edc856016740cc2be 100644 (file)
--- a/src/msw/minifram.cpp
+++ b/src/msw/minifram.cpp
@@ -45,7 +45,7 @@ long wxMiniFrame::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam
        (GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
      return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
    else if ( m_oldWndProc )
        (GetWindowStyleFlag() & wxTINY_CAPTION_VERT))
      return ::ibDefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
    else if ( m_oldWndProc )
-       return ::CallWindowProc((FARPROC)m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+       return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
    else
         return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
  }
    else
         return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
  }
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp

index d9ccfd0e0c12c9fb1a3960940a0d4548d87c80cb..ef1417069f02cbb6fb0237ebeb7d871ad877652a 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -53,6 +53,7 @@ wxTreeCtrl::wxTreeCtrl(void)
  {
    m_imageListNormal = NULL;
    m_imageListState = NULL;
  {
    m_imageListNormal = NULL;
    m_imageListState = NULL;
+  m_textCtrl = NULL;
  }
  
  bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
  }
  
  bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
@@ -67,6 +68,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
  
    m_imageListNormal = NULL;
    m_imageListState = NULL;
  
    m_imageListNormal = NULL;
    m_imageListState = NULL;
+  m_textCtrl = NULL;
  
    int x = pos.x;
    int y = pos.y;
  
    int x = pos.x;
    int y = pos.y;
@@ -131,7 +133,12 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
  
  wxTreeCtrl::~wxTreeCtrl(void)
  {
  
  wxTreeCtrl::~wxTreeCtrl(void)
  {
-  m_textCtrl.SetHWND((WXHWND) NULL);
+    if (m_textCtrl)
+    {
+        m_textCtrl->UnsubclassWin();
+        m_textCtrl->SetHWND((WXHWND) 0);
+        delete m_textCtrl;
+    }
  }
  
  // Attributes
  }
  
  // Attributes
@@ -412,11 +419,9 @@ bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
    return success;
  }
  
    return success;
  }
  
-wxTextCtrl& wxTreeCtrl::GetEditControl(void) const
+wxTextCtrl* wxTreeCtrl::GetEditControl(void) const
  {
  {
-  HWND hWnd = (HWND) TreeView_GetEditControl((HWND) GetHWND());
-  ((wxTreeCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
-  return (wxTextCtrl&) m_textCtrl;
+    return m_textCtrl;
  }
  
  // Operations
  }
  
  // Operations
@@ -527,11 +532,40 @@ bool wxTreeCtrl::DeleteAllItems(void)
    return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
  }
  
    return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
  }
  
-wxTextCtrl& wxTreeCtrl::Edit(long item)
+wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass)
+{
+    wxASSERT( (textControlClass->IsKindOf(CLASSINFO(wxTextCtrl))) );
+
+    HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
+
+    if (m_textCtrl)
+    {
+      m_textCtrl->UnsubclassWin();
+      m_textCtrl->SetHWND(0);
+      delete m_textCtrl;
+      m_textCtrl = NULL;
+    }
+
+    m_textCtrl = (wxTextCtrl*) textControlClass->CreateObject();
+    m_textCtrl->SetHWND((WXHWND) hWnd);
+    m_textCtrl->SubclassWin((WXHWND) hWnd);
+
+    return m_textCtrl;
+}
+
+// End label editing, optionally cancelling the edit
+bool wxTreeCtrl::EndEditLabel(bool cancel)
  {
  {
-  HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
-  m_textCtrl.SetHWND((WXHWND) hWnd);
-  return m_textCtrl;
+    bool success = (TreeView_EndEditLabelNow((HWND) GetHWND(), cancel) != 0);
+
+    if (m_textCtrl)
+    {
+      m_textCtrl->UnsubclassWin();
+      m_textCtrl->SetHWND(0);
+      delete m_textCtrl;
+      m_textCtrl = NULL;
+    }
+    return success;
  }
  
  long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
  }
  
  long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp

index 7ec89863e51519e5f135f08b799f249d327679ed..48495e2e697a6befea8d7912ddcf8cd877788929 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1874,7 +1874,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
  long wxWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
    if ( m_oldWndProc )
  long wxWindow::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
    if ( m_oldWndProc )
-       return ::CallWindowProc((FARPROC)m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
+       return ::CallWindowProc(CASTWNDPROC m_oldWndProc, (HWND) GetHWND(), (UINT) nMsg, (WPARAM) wParam, (LPARAM) lParam);
    else
         return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
  }
    else
         return ::DefWindowProc((HWND) GetHWND(), nMsg, wParam, lParam);
  }
diff --git a/utils/dialoged/src/makefile.b32 b/utils/dialoged/src/makefile.b32

index bda1b8a670aab326308e374aac054da7f3c4bb31..775201c4ae30ecf285a91290cd5c2fe26091423e 100644 (file)
--- a/utils/dialoged/src/makefile.b32
+++ b/utils/dialoged/src/makefile.b32
@@ -38,7 +38,7 @@ DEBUG_FLAGS =
  !endif
  CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
  
  !endif
  CPPFLAGS=$(DEBUG_FLAGS) $(OPT) @$(CFG) @$(INCFILE)
  
-OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj
+OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj winprop.obj edtree.obj edlist.obj symbtable.obj winstyle.obj
  
  $(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
    tlink32 $(LINKFLAGS) @&&!
  
  $(TARGET).exe: wxprop $(INCFILE) $(OBJECTS) $(TARGET).def $(TARGET).res
    tlink32 $(LINKFLAGS) @&&!
diff --git a/utils/dialoged/src/makefile.g95 b/utils/dialoged/src/makefile.g95

index c1fafdcc455e70c635e9331ac16c27aaa105c8fc..06db47a2fb66fb8e8bc9c87db242a1e922196140 100644 (file)
--- a/utils/dialoged/src/makefile.g95
+++ b/utils/dialoged/src/makefile.g95
@@ -16,7 +16,7 @@ include $(WXDIR)/src/makeg95.env
  
  OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
   $(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\
  
  OBJECTS = $(OBJDIR)/dialoged.$(OBJSUFF) $(OBJDIR)/reseditr.$(OBJSUFF)\
   $(OBJDIR)/dlghndlr.$(OBJSUFF) $(OBJDIR)/reswrite.$(OBJSUFF) $(OBJDIR)/winprop.$(OBJSUFF)\
- $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF)\
+ $(OBJDIR)/edlist.$(OBJSUFF) $(OBJDIR)/edtree.$(OBJSUFF) $(OBJDIR)/winstyle.$(OBJSUFF) $(OBJDIR)/symbtabl.$(OBJSUFF)\
   $(OBJDIR)/dialoged_resources.$(OBJSUFF)
  
  EXTRAINC = -I../../wxprop/src
   $(OBJDIR)/dialoged_resources.$(OBJSUFF)
  
  EXTRAINC = -I../../wxprop/src
@@ -58,6 +58,12 @@ $(OBJDIR)/edlist.$(OBJSUFF): winprop.h edlist.h edlist.$(SRCSUFF)
  $(OBJDIR)/edtree.$(OBJSUFF):   winprop.h edtree.h edtree.$(SRCSUFF)
         $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
  
  $(OBJDIR)/edtree.$(OBJSUFF):   winprop.h edtree.h edtree.$(SRCSUFF)
         $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
  
+$(OBJDIR)/winstyle.$(OBJSUFF): winstyle.h winstyle.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+
+$(OBJDIR)/symbtabl.$(OBJSUFF): symbtabl.h symbtabl.$(SRCSUFF)
+       $(CC) -c $(CPPFLAGS) -o $@ edtree.$(SRCSUFF)
+
  $(OBJDIR)/dialoged_resources.o:  dialoged.rc
         $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
  
  $(OBJDIR)/dialoged_resources.o:  dialoged.rc
         $(RESCOMP) -i dialoged.rc -o $(OBJDIR)/dialoged_resources.o $(RESFLAGS)
  
diff --git a/utils/dialoged/src/makefile.nt b/utils/dialoged/src/makefile.nt

index ee113fa8af54f55a3fca51a529c345bb5a6755dd..0dddc4198684bae87af888dbfa8dd80d46130f18 100644 (file)
--- a/utils/dialoged/src/makefile.nt
+++ b/utils/dialoged/src/makefile.nt
@@ -26,7 +26,7 @@ LOCALDOCDIR=$(WXDIR)\utils\dialoged\docs
  PROGRAM=dialoged
   
  OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
  PROGRAM=dialoged
   
  OBJECTS = dialoged.obj reseditr.obj dlghndlr.obj reswrite.obj\
-  winprop.obj edtree.obj edlist.obj symbtabl.obj
+  winprop.obj edtree.obj edlist.obj symbtabl.obj winstyle.obj
  
  all:    wxprop dialoged.exe
  
  
  all:    wxprop dialoged.exe
  
@@ -88,6 +88,11 @@ symbtabl.obj:      symbtabl.h symbtabl.$(SRCSUFF) $(DUMMYOBJ)
  $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
  <<
  
  $(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
  <<
  
+winstyle.obj:      winstyle.h winstyle.$(SRCSUFF) $(DUMMYOBJ)
+        $(cc) @<<
+$(CPPFLAGS) /c /Tp $*.$(SRCSUFF)
+<<
+
  $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
      $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
  
  $(PROGRAM).res :      $(PROGRAM).rc $(WXDIR)\include\wx\msw\wx.rc
      $(rc) -r /i$(WXDIR)\include -fo$@ $(PROGRAM).rc
  
diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp

index 6e98372ef5edc7c5f49af58f94477f1bea640c1d..ab4ff916019ad2c6c189207606f0a0e0f2383114 100644 (file)
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -141,7 +141,7 @@ bool wxResourceManager::Initialize()
    m_optionsResourceFilename = buf;
  #elif defined(__X__)
    char buf[500];
    m_optionsResourceFilename = buf;
  #elif defined(__X__)
    char buf[500];
-  ()wxGetHomeDir(buf);
+  wxGetHomeDir(buf);
    strcat(buf, "/.dialogedrc");
    m_optionsResourceFilename = buf;
  #else
    strcat(buf, "/.dialogedrc");
    m_optionsResourceFilename = buf;
  #else
@@ -329,6 +329,7 @@ bool wxResourceManager::Save(const wxString& filename)
    InstantiateAllResourcesFromWindows();
    if (m_resourceTable.Save(filename))
    {
    InstantiateAllResourcesFromWindows();
    if (m_resourceTable.Save(filename))
    {
+    m_symbolTable.WriteIncludeFile(m_symbolFilename);
      Modify(FALSE);
      return TRUE;
    }
      Modify(FALSE);
      return TRUE;
    }
@@ -345,6 +346,15 @@ bool wxResourceManager::SaveAs()
      return FALSE;
      
    m_currentFilename = s;
      return FALSE;
      
    m_currentFilename = s;
+  wxStripExtension(m_currentFilename);
+  m_currentFilename += ".wxr";
+
+  // Construct include filename from this file
+  m_symbolFilename = m_currentFilename;
+
+  wxStripExtension(m_symbolFilename);
+  m_symbolFilename += ".h";
+
    Save(m_currentFilename);
    return TRUE;
  }
    Save(m_currentFilename);
    return TRUE;
  }
@@ -401,6 +411,8 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
      {
          wxString str("Could not find include file ");
          str += m_symbolFilename;
      {
          wxString str("Could not find include file ");
          str += m_symbolFilename;
+        str += ".\nDialog Editor maintains a header file containing id symbols to be used in the application.\n";
+        str += "The next time this .wxr file is saved, a header file will be saved also.";
          wxMessageBox(str, "Dialog Editor Warning", MB_OK);
  
          m_symbolIdCounter = 99;
          wxMessageBox(str, "Dialog Editor Warning", MB_OK);
  
          m_symbolIdCounter = 99;
@@ -410,6 +422,19 @@ bool wxResourceManager::New(bool loadFromFile, const wxString& filename)
          // Set the id counter to the last known id
          m_symbolIdCounter = m_symbolTable.FindHighestId();
      }
          // Set the id counter to the last known id
          m_symbolIdCounter = m_symbolTable.FindHighestId();
      }
+
+    // Now check in case some (or all) resources don't have resource ids, or they
+    // don't match the .h file, or something of that nature.
+    bool altered = RepairResourceIds();
+    if (altered)
+    {
+        wxMessageBox("Some resources have had new identifiers associated with them, since they were missing.", "Dialog Editor Warning", MB_OK);
+        Modify(TRUE);
+    }
+    else
+        Modify(FALSE);
+
+    return TRUE;
    }
    else
    {
    }
    else
    {
@@ -885,11 +910,10 @@ bool wxResourceManager::CreateNewPanel()
    ClearCurrentDialog();
  
    char buf[256];
    ClearCurrentDialog();
  
    char buf[256];
-  MakeUniqueName("panel", buf);
+  MakeUniqueName("dialog", buf);
    
    wxItemResource *resource = new wxItemResource;
    
    wxItemResource *resource = new wxItemResource;
-//  resource->SetType(wxTYPE_PANEL);
-  resource->SetType("wxPanel");
+  resource->SetType("wxDialog");
    resource->SetName(buf);
    resource->SetTitle(buf);
  
    resource->SetName(buf);
    resource->SetTitle(buf);
  
@@ -904,10 +928,10 @@ bool wxResourceManager::CreateNewPanel()
  
    wxPanel *panel = new wxPanel(m_editorPanel, -1,
       wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),
  
    wxPanel *panel = new wxPanel(m_editorPanel, -1,
       wxPoint(m_editorPanel->GetMarginX(), m_editorPanel->GetMarginY()),
-     wxSize(400, 300), wxRAISED_BORDER, buf);
+     wxSize(400, 300), wxRAISED_BORDER|wxDEFAULT_DIALOG_STYLE, buf);
    m_editorPanel->m_childWindow = panel;
  
    m_editorPanel->m_childWindow = panel;
  
-  resource->SetStyle(0); // panel->GetWindowStyleFlag());
+  resource->SetStyle(panel->GetWindowStyleFlag());
    resource->SetSize(10, 10, 400, 300);
  
    // For editing in situ we will need to use the hash table to ensure
    resource->SetSize(10, 10, 400, 300);
  
    // For editing in situ we will need to use the hash table to ensure
@@ -992,7 +1016,7 @@ bool wxResourceManager::CreatePanelItem(wxItemResource *panelResource, wxPanel *
      }
    else if (itemType == "wxListBox")
      {
      }
    else if (itemType == "wxListBox")
      {
-      prefix = "ID_LISTBIX";
+      prefix = "ID_LISTBOX";
        MakeUniqueName("listbox", buf);
        res->SetName(buf);
        newItem = new wxListBox(panel, -1, wxPoint(x, y), wxSize(-1, -1), 0, NULL, 0, wxDefaultValidator, buf);
        MakeUniqueName("listbox", buf);
        res->SetName(buf);
        newItem = new wxListBox(panel, -1, wxPoint(x, y), wxSize(-1, -1), 0, NULL, 0, wxDefaultValidator, buf);
@@ -1114,14 +1138,14 @@ bool wxResourceManager::TestCurrentDialog(wxWindow* parent)
      wxDialog* dialog = new wxDialog;
      long oldStyle = item->GetStyle();
      bool success = FALSE;
      wxDialog* dialog = new wxDialog;
      long oldStyle = item->GetStyle();
      bool success = FALSE;
-    item->SetStyle(wxDEFAULT_DIALOG_STYLE);
+//    item->SetStyle(wxDEFAULT_DIALOG_STYLE);
      if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
      {
          dialog->Centre();
          dialog->ShowModal();
          success = TRUE;
      }
      if (dialog->LoadFromResource(parent, item->GetName(), & m_resourceTable))
      {
          dialog->Centre();
          dialog->ShowModal();
          success = TRUE;
      }
-    item->SetStyle(oldStyle);
+//    item->SetStyle(oldStyle);
      return success;
    }
    return FALSE;
      return success;
    }
    return FALSE;
@@ -1521,12 +1545,13 @@ bool wxResourceManager::IsSymbolUsed(wxItemResource* thisResource, wxWindowID id
    while (node = m_resourceTable.Next())
    {
      wxItemResource *res = (wxItemResource *)node->Data();
    while (node = m_resourceTable.Next())
    {
      wxItemResource *res = (wxItemResource *)node->Data();
-    if ((res != thisResource) && (res->GetId() == id))
-        return TRUE;
  
      wxString resType(res->GetType());
      if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
      {
  
      wxString resType(res->GetType());
      if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
      {
+      if ((res != thisResource) && (res->GetId() == id))
+          return TRUE;
+
        wxNode *node1 = res->GetChildren().First();
        while (node1)
        {
        wxNode *node1 = res->GetChildren().First();
        while (node1)
        {
@@ -1563,12 +1588,13 @@ void wxResourceManager::ChangeIds(int oldId, int newId)
    while (node = m_resourceTable.Next())
    {
      wxItemResource *res = (wxItemResource *)node->Data();
    while (node = m_resourceTable.Next())
    {
      wxItemResource *res = (wxItemResource *)node->Data();
-    if (res->GetId() == oldId)
-        res->SetId(newId);
  
      wxString resType(res->GetType());
      if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
      {
  
      wxString resType(res->GetType());
      if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
      {
+      if (res->GetId() == oldId)
+          res->SetId(newId);
+
        wxNode *node1 = res->GetChildren().First();
        while (node1)
        {
        wxNode *node1 = res->GetChildren().First();
        while (node1)
        {
@@ -1582,6 +1608,71 @@ void wxResourceManager::ChangeIds(int oldId, int newId)
    }
  }
  
    }
  }
  
+// If any resource ids were missing (or their symbol was missing),
+// repair them i.e. give them new ids. Returns TRUE if any resource
+// needed repairing.
+bool wxResourceManager::RepairResourceIds()
+{
+  bool repaired = FALSE;
+
+  m_resourceTable.BeginFind();
+  wxNode *node;
+  while (node = m_resourceTable.Next())
+  {
+    wxItemResource *res = (wxItemResource *)node->Data();
+    wxString resType(res->GetType());
+    if (resType == "wxDialog" || resType == "wxDialogBox" || resType == "wxPanel")
+    {
+
+      if ( (res->GetId() == 0) || ((res->GetId() > 0) && !m_symbolTable.IdExists(res->GetId())) )
+      {
+          wxString newSymbolName;
+          int newId = GenerateWindowId("ID_DIALOG", newSymbolName) ;
+
+          if (res->GetId() == 0)
+          {
+              res->SetId(newId);
+              m_symbolTable.AddSymbol(newSymbolName, newId);
+          }
+          else
+          {
+              m_symbolTable.AddSymbol(newSymbolName, res->GetId());
+          }
+
+          repaired = TRUE;
+      }
+
+      wxNode *node1 = res->GetChildren().First();
+      while (node1)
+      {
+        wxItemResource *child = (wxItemResource *)node1->Data();
+
+        if ( (child->GetId() == 0) || ((child->GetId() > 0) && !m_symbolTable.IdExists(child->GetId())) )
+        {
+            wxString newSymbolName;
+            int newId = GenerateWindowId("ID_CONTROL", newSymbolName) ;
+
+            if (child->GetId() == 0)
+            {
+                child->SetId(newId);
+                m_symbolTable.AddSymbol(newSymbolName, newId);
+            }
+            else
+            {
+                m_symbolTable.AddSymbol(newSymbolName, child->GetId());
+            }
+
+            repaired = TRUE;
+        }
+
+        node1 = node1->Next();
+      }
+    }
+  }
+  return repaired;
+}
+
+
   // Deletes 'win' and creates a new window from the resource that
   // was associated with it. E.g. if you can't change properties on the
   // fly, you'll need to delete the window and create it again.
   // Deletes 'win' and creates a new window from the resource that
   // was associated with it. E.g. if you can't change properties on the
   // fly, you'll need to delete the window and create it again.
diff --git a/utils/dialoged/src/reseditr.h b/utils/dialoged/src/reseditr.h

index dde51c0ea62bde45af096aee9a229b5693a40bef..e2dafcc71ce0e69ac842b93e8a4d32c9c0ba96d0 100644 (file)
--- a/utils/dialoged/src/reseditr.h
+++ b/utils/dialoged/src/reseditr.h
@@ -27,6 +27,7 @@
  
  #include "proplist.h"
  #include "symbtabl.h"
  
  #include "proplist.h"
  #include "symbtabl.h"
+#include "winstyle.h"
  
  #define RESED_DELETE            1
  #define RESED_RECREATE          3
  
  #define RESED_DELETE            1
  #define RESED_RECREATE          3
@@ -112,14 +113,16 @@ class wxResourceTableWithSaving: public wxResourceTable
   public:
    wxResourceTableWithSaving():wxResourceTable()
    {
   public:
    wxResourceTableWithSaving():wxResourceTable()
    {
+    // Add all known window styles
+    m_styleTable.Init();
    }
    virtual bool Save(const wxString& filename);
    virtual bool SaveResource(ostream& stream, wxItemResource *item);
  
    }
    virtual bool Save(const wxString& filename);
    virtual bool SaveResource(ostream& stream, wxItemResource *item);
  
-  void GenerateWindowStyleString(long windowStyle, char *buf);
    void GeneratePanelStyleString(long windowStyle, char *buf);
    void GenerateDialogStyleString(long windowStyle, char *buf);
  
    void GeneratePanelStyleString(long windowStyle, char *buf);
    void GenerateDialogStyleString(long windowStyle, char *buf);
  
+/*
    void GenerateRadioBoxStyleString(long windowStyle, char *buf);
    void GenerateMessageStyleString(long windowStyle, char *buf);
    void GenerateTextStyleString(long windowStyle, char *buf);
    void GenerateRadioBoxStyleString(long windowStyle, char *buf);
    void GenerateMessageStyleString(long windowStyle, char *buf);
    void GenerateTextStyleString(long windowStyle, char *buf);
@@ -131,13 +134,21 @@ class wxResourceTableWithSaving: public wxResourceTable
    void GenerateGroupBoxStyleString(long windowStyle, char *buf);
    void GenerateGaugeStyleString(long windowStyle, char *buf);
    void GenerateChoiceStyleString(long windowStyle, char *buf);
    void GenerateGroupBoxStyleString(long windowStyle, char *buf);
    void GenerateGaugeStyleString(long windowStyle, char *buf);
    void GenerateChoiceStyleString(long windowStyle, char *buf);
+  void GenerateComboBoxStyleString(long windowStyle, char *buf);
    void GenerateScrollBarStyleString(long windowStyle, char *buf);
    void GenerateScrollBarStyleString(long windowStyle, char *buf);
-  void GenerateItemStyleString(long windowStyle, char *buf);
-  
+*/
+
+  void GenerateControlStyleString(const wxString& windowClass, long windowStyle, char *buf);
+
+/*
    bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
    bool GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle);
+*/
  
    void OutputFont(ostream& stream, wxFont *font);
    wxControl *CreateItem(wxPanel *panel, wxItemResource *childResource);
  
    void OutputFont(ostream& stream, wxFont *font);
    wxControl *CreateItem(wxPanel *panel, wxItemResource *childResource);
+
+protected:
+  wxWindowStyleTable    m_styleTable;
  };
   
  class wxResourceEditorScrolledWindow;
  };
   
  class wxResourceEditorScrolledWindow;
@@ -232,6 +243,11 @@ public:
     // must be changed.
     void ChangeIds(int oldId, int newId);
  
     // must be changed.
     void ChangeIds(int oldId, int newId);
  
+   // If any resource ids were missing (or their symbol was missing),
+   // repair them i.e. give them new ids. Returns TRUE if any resource
+   // needed repairing.
+   bool RepairResourceIds();
+
     // Deletes 'win' and creates a new window from the resource that
     // was associated with it. E.g. if you can't change properties on the
     // fly, you'll need to delete the window and create it again.
     // Deletes 'win' and creates a new window from the resource that
     // was associated with it. E.g. if you can't change properties on the
     // fly, you'll need to delete the window and create it again.
diff --git a/utils/dialoged/src/reswrite.cpp b/utils/dialoged/src/reswrite.cpp

index 695bf6081d11d9505e2a982685aa24c0f9c479bd..79084eb22738ac6855867bb19076d3d2978eeaac 100644 (file)
--- a/utils/dialoged/src/reswrite.cpp
+++ b/utils/dialoged/src/reswrite.cpp
@@ -108,14 +108,14 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
        else
        {
          stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";
        else
        {
          stream << "static char *" << item->GetName() << " = \"panel(name = '" << item->GetName() << "',\\\n";
-        GeneratePanelStyleString(item->GetStyle(), styleBuf);
+        GenerateDialogStyleString(item->GetStyle(), styleBuf);
        }
        stream << "  style = '" << styleBuf << "',\\\n";
        stream << "  title = '" << item->GetTitle() << "',\\\n";
        }
        stream << "  style = '" << styleBuf << "',\\\n";
        stream << "  title = '" << item->GetTitle() << "',\\\n";
+      stream << "  id = " << item->GetId() << ",\\\n";
        stream << "  x = " << item->GetX() << ", y = " << item->GetY();
        stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight();
        stream << "  x = " << item->GetX() << ", y = " << item->GetY();
        stream << ", width = " << item->GetWidth() << ", height = " << item->GetHeight();
-//      stream << "  modal = " << item->GetValue1();
-      
+
        if (1) // item->GetStyle() & wxNO_3D)
        {
          if (item->GetBackgroundColour())
        if (1) // item->GetStyle() & wxNO_3D)
        {
          if (item->GetBackgroundColour())
@@ -128,29 +128,6 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
  
            stream << ",\\\n  " << "background_colour = '" << buf << "'";
          }
  
            stream << ",\\\n  " << "background_colour = '" << buf << "'";
          }
-#if 0
-        if (item->GetLabelColour())
-        {
-          char buf[7];
-          wxDecToHex(item->GetLabelColour()->Red(), buf);
-          wxDecToHex(item->GetLabelColour()->Green(), buf+2);
-          wxDecToHex(item->GetLabelColour()->Blue(), buf+4);
-          buf[6] = 0;
-
-          stream << ",\\\n  " << "label_colour = '" << buf << "'";
-        }
-        if (item->GetButtonColour())
-        {
-          char buf[7];
-          wxDecToHex(item->GetButtonColour()->Red(), buf);
-          wxDecToHex(item->GetButtonColour()->Green(), buf+2);
-          wxDecToHex(item->GetButtonColour()->Blue(), buf+4);
-          buf[6] = 0;
-
-          stream << ",\\\n  " << "button_colour = '" << buf << "'";
-        }
-#endif
-
        }
        
        if (item->GetFont() && item->GetFont()->Ok())
        }
        
        if (item->GetFont() && item->GetFont()->Ok())
@@ -182,8 +159,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxButton" || itemType == "wxBitmapButton")
      {
      }
    else if (itemType == "wxButton" || itemType == "wxBitmapButton")
      {
-      GenerateButtonStyleString(item->GetStyle(), styleBuf);
-      stream << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetValue4())
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetValue4())
@@ -196,8 +173,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxStaticText" || itemType == "wxStaticBitmap")
      {
      }
    else if (itemType == "wxStaticText" || itemType == "wxStaticBitmap")
      {
-      GenerateMessageStyleString(item->GetStyle(), styleBuf);
-      stream << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetValue4())
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetValue4())
@@ -210,8 +187,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxCheckBox")
      {
      }
    else if (itemType == "wxCheckBox")
      {
-      GenerateCheckBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxCheckBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1();
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1();
@@ -223,8 +200,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxRadioButton")
      {
      }
    else if (itemType == "wxRadioButton")
      {
-      GenerateRadioButtonStyleString(item->GetStyle(), styleBuf);
-      stream << "wxRadioButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxRadioButton, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1();
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1();
@@ -236,8 +213,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxStaticBox")
      {
      }
    else if (itemType == "wxStaticBox")
      {
-      GenerateGroupBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxGroupBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxGroupBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetFont())
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        if (item->GetFont())
@@ -248,8 +225,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxText" || itemType == "wxMultiText" || itemType == "wxTextCtrl")
      {
      }
    else if (itemType == "wxText" || itemType == "wxMultiText" || itemType == "wxTextCtrl")
      {
-      GenerateTextStyleString(item->GetStyle(), styleBuf);
-      stream << "wxTextCtrl, ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxTextCtrl, ";
        stream << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
@@ -262,8 +239,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxGauge")
      {
      }
    else if (itemType == "wxGauge")
      {
-      GenerateGaugeStyleString(item->GetStyle(), styleBuf);
-      stream << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxGauge, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2();
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2();
@@ -275,8 +252,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxSlider")
      {
      }
    else if (itemType == "wxSlider")
      {
-      GenerateSliderStyleString(item->GetStyle(), styleBuf);
-      stream << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxSlider, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3();
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3();
@@ -288,8 +265,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxScrollBar")
      {
      }
    else if (itemType == "wxScrollBar")
      {
-      GenerateScrollBarStyleString(item->GetStyle(), styleBuf);
-      stream << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxScrollBar, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3() << ", ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
        stream << ", " << item->GetValue1() << ", " << item->GetValue2() << ", " << item->GetValue3() << ", ";
@@ -297,8 +274,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
      }
    else if (itemType == "wxListBox")
      {
      }
    else if (itemType == "wxListBox")
      {
-      GenerateListBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxListBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
@@ -343,13 +320,17 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
          OutputFont(stream, item->GetFont());
        }
      }
          OutputFont(stream, item->GetFont());
        }
      }
-  else if (itemType == "wxChoice")
+  else if (itemType == "wxChoice" || itemType == "wxComboBox")
      {
      {
-      GenerateChoiceStyleString(item->GetStyle(), styleBuf);
-      stream << "wxChoice, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+
+      stream << item->GetId() << ", " << itemType << ", " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
+      if (itemType == "wxComboBox")
+        stream << SafeWord(item->GetValue4()) << ", ";
+
        // Default list of values
  
        stream << ", [";
        // Default list of values
  
        stream << ", [";
@@ -375,8 +356,8 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
    else if (itemType == "wxRadioBox")
      {
        // Must write out the orientation and number of rows/cols!!
    else if (itemType == "wxRadioBox")
      {
        // Must write out the orientation and number of rows/cols!!
-      GenerateRadioBoxStyleString(item->GetStyle(), styleBuf);
-      stream << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
+      GenerateControlStyleString(itemType, item->GetStyle(), styleBuf);
+      stream << item->GetId() << ", " << "wxRadioBox, " << SafeWord(item->GetTitle()) << ", '" << styleBuf << "', ";
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
        stream << SafeWord(item->GetName()) << ", " << item->GetX() << ", " << item->GetY() << ", ";
        stream << item->GetWidth() << ", " << item->GetHeight();
  
@@ -531,31 +512,13 @@ bool wxResourceTableWithSaving::SaveResource(ostream& stream, wxItemResource *it
    return TRUE;
  }
  
    return TRUE;
  }
  
-void wxResourceTableWithSaving::GenerateWindowStyleString(long windowStyle, char *buf)
-{
-  GenerateStyle(buf, windowStyle, wxNO_3D, "wxNO_3D");
-  GenerateStyle(buf, windowStyle, wxVSCROLL, "wxVSCROLL");
-  GenerateStyle(buf, windowStyle, wxHSCROLL, "wxHSCROLL");
-  GenerateStyle(buf, windowStyle, wxBORDER, "wxBORDER");
-}
-
  void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char *buf)
  {
    buf[0] = 0;
  void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char *buf)
  {
    buf[0] = 0;
-  GenerateWindowStyleString(windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxDialog", windowStyle, buf);
  
  
-/*
-  GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
-*/
-  if (!GenerateStyle(buf, windowStyle, wxDEFAULT_DIALOG_STYLE, "wxDEFAULT_DIALOG_STYLE"))
-  {
-    GenerateStyle(buf, windowStyle, wxCAPTION, "wxCAPTION");
-    GenerateStyle(buf, windowStyle, wxTHICK_FRAME, "wxTHICK_FRAME");
-    GenerateStyle(buf, windowStyle, wxRESIZE_BORDER, "wxRESIZE_BORDER");
-    GenerateStyle(buf, windowStyle, wxSYSTEM_MENU, "wxSYSTEM_MENU");
-    GenerateStyle(buf, windowStyle, wxMINIMIZE_BOX, "wxMINIMIZE_BOX");
-    GenerateStyle(buf, windowStyle, wxMAXIMIZE_BOX, "wxMAXIMIZE_BOX");
-  }
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
@@ -563,158 +526,25 @@ void wxResourceTableWithSaving::GenerateDialogStyleString(long windowStyle, char
  void wxResourceTableWithSaving::GeneratePanelStyleString(long windowStyle, char *buf)
  {
    buf[0] = 0;
  void wxResourceTableWithSaving::GeneratePanelStyleString(long windowStyle, char *buf)
  {
    buf[0] = 0;
-  GenerateWindowStyleString(windowStyle, buf);
-
-/*
-  GenerateStyle(buf, windowStyle, wxRETAINED, "wxRETAINED");
-*/
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-
-void wxResourceTableWithSaving::GenerateItemStyleString(long windowStyle, char *buf)
-{
-  GenerateWindowStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxHORIZONTAL, "wxHORIZONTAL");
-  GenerateStyle(buf, windowStyle, wxVERTICAL, "wxVERTICAL");
-}
-
-void wxResourceTableWithSaving::GenerateRadioBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxPanel", windowStyle, buf);
  
  
-void wxResourceTableWithSaving::GenerateMessageStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
  
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
  
-void wxResourceTableWithSaving::GenerateTextStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxTE_PROCESS_ENTER, "wxTE_PROCESS_ENTER");
-  GenerateStyle(buf, windowStyle, wxTE_READONLY, "wxTE_READONLY");
-  GenerateStyle(buf, windowStyle, wxTE_PASSWORD, "wxTE_PASSWORD");
-  GenerateStyle(buf, windowStyle, wxTE_MULTILINE, "wxTE_MULTILINE");
  
  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateButtonStyleString(long windowStyle, char *buf)
+void wxResourceTableWithSaving::GenerateControlStyleString(const wxString& windowClass, long windowStyle, char *buf)
  {
    buf[0] = 0;
  {
    buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
+  m_styleTable.GenerateStyleStrings("wxWindow", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings("wxControl", windowStyle, buf);
+  m_styleTable.GenerateStyleStrings(windowClass, windowStyle, buf);
  
  
-void wxResourceTableWithSaving::GenerateCheckBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
  
    if (strlen(buf) == 0)
      strcat(buf, "0");
  }
  
-void wxResourceTableWithSaving::GenerateRadioButtonStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateListBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxLB_ALWAYS_SB, "wxLB_ALWAYS_SB");
-  GenerateStyle(buf, windowStyle, wxLB_SORT,      "wxLB_SORT");
-//  GenerateStyle(buf, windowStyle, wxLB_SINGLE,    "wxLB_SINGLE"); // Done already
-  GenerateStyle(buf, windowStyle, wxLB_MULTIPLE,  "wxLB_MULTIPLE");
-  GenerateStyle(buf, windowStyle, wxLB_EXTENDED,  "wxLB_EXTENDED");
-
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateSliderStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateGroupBoxStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateGaugeStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  GenerateStyle(buf, windowStyle, wxGA_PROGRESSBAR, "wxGA_PROGRESSBAR");
-
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateChoiceStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-void wxResourceTableWithSaving::GenerateScrollBarStyleString(long windowStyle, char *buf)
-{
-  buf[0] = 0;
-  GenerateItemStyleString(windowStyle, buf);
-  
-  if (strlen(buf) == 0)
-    strcat(buf, "0");
-}
-
-bool wxResourceTableWithSaving::GenerateStyle(char *buf, long windowStyle, long flag, char *strStyle)
-{
-  if ((windowStyle & flag) == flag)
-  {
-    if (strlen(buf) > 0)
-      strcat(buf, " | ");
-    strcat(buf, strStyle);
-    return TRUE;
-  }
-  else
-    return FALSE;
-}
-
  // Returns quoted string or "NULL"
  char *SafeString(char *s)
  {
  // Returns quoted string or "NULL"
  char *SafeString(char *s)
  {
diff --git a/utils/dialoged/src/symbtabl.cpp b/utils/dialoged/src/symbtabl.cpp

index 65e038b3d22f4883f34881d5dc3ec5270f4691a8..a85aefcf83fb38b1f66d8442bf67788d89377be7 100644 (file)
--- a/utils/dialoged/src/symbtabl.cpp
+++ b/utils/dialoged/src/symbtabl.cpp
@@ -121,6 +121,13 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
      if (!file.Open(filename, wxFile::write))
          return FALSE;
  
      if (!file.Open(filename, wxFile::write))
          return FALSE;
  
+    wxString fileOnly(wxFileNameFromPath(filename));
+    wxString line;
+    line.Printf("/*\n * %s\n * Window identifiers file written by Dialog Editor\n */\n\n",
+        (const char*) fileOnly);
+
+    file.Write(line, line.Length());
+
      m_hashTable.BeginFind();
  
      wxNode* node = m_hashTable.Next();
      m_hashTable.BeginFind();
  
      wxNode* node = m_hashTable.Next();
diff --git a/utils/dialoged/src/winprop.cpp b/utils/dialoged/src/winprop.cpp

index 0bb93c4a27fd12362ec813c46e398bbffdd599b2..12ae6b0df4f3844412819362f9878f0054ba9899 100644 (file)
--- a/utils/dialoged/src/winprop.cpp
+++ b/utils/dialoged/src/winprop.cpp
@@ -74,6 +74,7 @@ wxWindow *wxPropertyInfo::sm_propertyWindow;
   * wxDialogEditorPropertyListDialog
   */
  
   * wxDialogEditorPropertyListDialog
   */
  
+ /*
  wxDialogEditorPropertyListDialog::wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
          const wxPoint& pos, const wxSize& size,
          long style, const wxString& name):
  wxDialogEditorPropertyListDialog::wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
          const wxPoint& pos, const wxSize& size,
          long style, const wxString& name):
@@ -89,6 +90,23 @@ wxDialogEditorPropertyListDialog::~wxDialogEditorPropertyListDialog()
      delete m_propInfo;
      wxPropertyInfo::sm_propertyWindow = NULL;
  }
      delete m_propInfo;
      wxPropertyInfo::sm_propertyWindow = NULL;
  }
+*/
+
+wxDialogEditorPropertyListFrame::wxDialogEditorPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
+        const wxPoint& pos, const wxSize& size,
+        long style, const wxString& name):
+            wxPropertyListFrame(v, parent, title, pos, size, style, name)
+{
+        m_propSheet = NULL;
+        m_propInfo = NULL;
+}
+
+wxDialogEditorPropertyListFrame::~wxDialogEditorPropertyListFrame()
+{
+    delete m_propSheet;
+    delete m_propInfo;
+    wxPropertyInfo::sm_propertyWindow = NULL;
+}
  
  /*
   * wxPropertyInfo
  
  /*
   * wxPropertyInfo
@@ -127,32 +145,32 @@ bool wxPropertyInfo::Edit(wxWindow *parent, const wxString& title)
    propSheet->SetAllModified(FALSE);
  
    wxResourcePropertyListView *view = new wxResourcePropertyListView(this, NULL,
    propSheet->SetAllModified(FALSE);
  
    wxResourcePropertyListView *view = new wxResourcePropertyListView(this, NULL,
-#ifdef __XVIEW__
       wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL |
       wxPROP_BUTTON_OK | wxPROP_BUTTON_CANCEL |
-#endif
       wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES);
  
       wxPROP_BUTTON_CHECK_CROSS|wxPROP_DYNAMIC_VALUE_FIELD|wxPROP_PULLDOWN|wxPROP_SHOWVALUES);
  
-  wxDialogEditorPropertyListDialog *propDialog = new wxDialogEditorPropertyListDialog(view,
+  wxDialogEditorPropertyListFrame *propWin = new wxDialogEditorPropertyListFrame(view,
      wxResourceManager::GetCurrentResourceManager()->GetEditorFrame(), title, wxPoint(x, y),
      wxResourceManager::GetCurrentResourceManager()->GetEditorFrame(), title, wxPoint(x, y),
-    wxSize(width, height), wxDEFAULT_DIALOG_STYLE);
-  sm_propertyWindow = propDialog;
+    wxSize(width, height), wxDEFAULT_FRAME_STYLE);
+  sm_propertyWindow = propWin;
+
+  propWin->m_registry.RegisterValidator((wxString)"real", new wxRealListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"string", new wxStringListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"integer", new wxIntegerListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"bool", new wxBoolListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"filename", new wxFilenameListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"stringlist", new wxListOfStringsListValidator);
+  propWin->m_registry.RegisterValidator((wxString)"window_id", new wxResourceSymbolValidator);
  
  
-  propDialog->m_registry.RegisterValidator((wxString)"real", new wxRealListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"string", new wxStringListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"integer", new wxIntegerListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"bool", new wxBoolListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"filename", new wxFilenameListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"stringlist", new wxListOfStringsListValidator);
-  propDialog->m_registry.RegisterValidator((wxString)"window_id", new wxResourceSymbolValidator);
+  propWin->m_propInfo = this;
+  propWin->m_propSheet = propSheet;
  
  
-  propDialog->m_propInfo = this;
-  propDialog->m_propSheet = propSheet;
+//  view->propertyWindow = propWin;
+  view->AddRegistry(&(propWin->m_registry));
  
  
-//  view->propertyWindow = propDialog;
-  view->AddRegistry(&(propDialog->m_registry));
-  view->ShowView(propSheet, propDialog);
+  propWin->Initialize();
+  view->ShowView(propSheet, propWin->GetPropertyPanel());
  
  
-  propDialog->Show(TRUE);
+  propWin->Show(TRUE);
    return TRUE;
  }
  
    return TRUE;
  }
  
@@ -511,6 +529,27 @@ bool wxWindowPropertyInfo::InstantiateResource(wxItemResource *resource)
    return TRUE;
  }
  
    return TRUE;
  }
  
+// Set the window style
+void wxWindowPropertyInfo::SetWindowStyle(wxWindow* win, long style, bool set)
+{
+    if (style == 0)
+        return;
+
+    if ((win->GetWindowStyleFlag() & style) == style)
+    {
+        if (!set)
+        {
+            win->SetWindowStyleFlag(win->GetWindowStyleFlag() - style);
+        }
+    }
+    else
+    {
+        if (set)
+        {
+            win->SetWindowStyleFlag(win->GetWindowStyleFlag() | style);
+        }
+    }
+}
  
  /*
   * Controls
  
  /*
   * Controls
@@ -594,8 +633,8 @@ bool wxButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxButtonPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxButtonPropertyInfo::GetPropertyNames(wxStringList& names)
  {
-  names.Add("label");
    wxItemPropertyInfo::GetPropertyNames(names);
    wxItemPropertyInfo::GetPropertyNames(names);
+  names.Add("label");
  }
  
  bool wxButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -696,8 +735,8 @@ bool wxStaticTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxStaticTextPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxStaticTextPropertyInfo::GetPropertyNames(wxStringList& names)
  {
-  names.Add("label");
    wxItemPropertyInfo::GetPropertyNames(names);
    wxItemPropertyInfo::GetPropertyNames(names);
+  names.Add("label");
  }
  
  bool wxStaticTextPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxStaticTextPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -772,8 +811,8 @@ bool wxStaticBitmapPropertyInfo::SetProperty(wxString& name, wxProperty *propert
  
  void wxStaticBitmapPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxStaticBitmapPropertyInfo::GetPropertyNames(wxStringList& names)
  {
-  names.Add("label");
    wxItemPropertyInfo::GetPropertyNames(names);
    wxItemPropertyInfo::GetPropertyNames(names);
+  names.Add("label");
  }
  
  bool wxStaticBitmapPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxStaticBitmapPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -856,10 +895,10 @@ bool wxTextPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxTextPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxTextPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("value");
    names.Add("readonly");
    names.Add("password");
    names.Add("value");
    names.Add("readonly");
    names.Add("password");
-  wxItemPropertyInfo::GetPropertyNames(names);  
  }
  
  bool wxTextPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxTextPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -955,9 +994,9 @@ bool wxListBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxListBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxListBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("values");
    names.Add("multiple");
    names.Add("values");
    names.Add("multiple");
-  wxItemPropertyInfo::GetPropertyNames(names);  
  }
  
  bool wxListBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxListBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1024,8 +1063,8 @@ bool wxChoicePropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxChoicePropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxChoicePropertyInfo::GetPropertyNames(wxStringList& names)
  {
-  names.Add("values");
    wxItemPropertyInfo::GetPropertyNames(names);
    wxItemPropertyInfo::GetPropertyNames(names);
+  names.Add("values");
  }
  
  bool wxChoicePropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxChoicePropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1144,11 +1183,11 @@ bool wxRadioBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxRadioBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxRadioBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("label");
    names.Add("values");
    names.Add("orientation");
    names.Add("numberRowsOrCols");
    names.Add("label");
    names.Add("values");
    names.Add("orientation");
    names.Add("numberRowsOrCols");
-  wxItemPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxRadioBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1190,8 +1229,8 @@ bool wxGroupBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxGroupBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {  
  
  void wxGroupBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {  
-  names.Add("label");
    wxItemPropertyInfo::GetPropertyNames(names);
    wxItemPropertyInfo::GetPropertyNames(names);
+  names.Add("label");
  }
  
  bool wxGroupBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxGroupBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1227,9 +1266,9 @@ bool wxCheckBoxPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxCheckBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxCheckBoxPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("label");
    names.Add("value");
    names.Add("label");
    names.Add("value");
-  wxItemPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxCheckBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxCheckBoxPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1266,9 +1305,9 @@ bool wxRadioButtonPropertyInfo::SetProperty(wxString& name, wxProperty *property
  
  void wxRadioButtonPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxRadioButtonPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("label");
    names.Add("value");
    names.Add("label");
    names.Add("value");
-  wxItemPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxRadioButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxRadioButtonPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1363,11 +1402,11 @@ bool wxSliderPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxSliderPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxSliderPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("value");
    names.Add("orientation");
    names.Add("min_value");
    names.Add("max_value");
    names.Add("value");
    names.Add("orientation");
    names.Add("min_value");
    names.Add("max_value");
-  wxItemPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxSliderPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxSliderPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1413,9 +1452,9 @@ bool wxGaugePropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxGaugePropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxGaugePropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("value");
    names.Add("max_value");
    names.Add("value");
    names.Add("max_value");
-  wxItemPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxGaugePropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxGaugePropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1533,12 +1572,12 @@ bool wxScrollBarPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxScrollBarPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxScrollBarPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxItemPropertyInfo::GetPropertyNames(names);
    names.Add("orientation");
    names.Add("value");
    names.Add("pageSize");
    names.Add("viewLength");
    names.Add("objectLength");
    names.Add("orientation");
    names.Add("value");
    names.Add("pageSize");
    names.Add("viewLength");
    names.Add("objectLength");
-  wxItemPropertyInfo::GetPropertyNames(names);
  
    // Remove some properties we don't inherit
    names.Delete("fontPoints");
  
    // Remove some properties we don't inherit
    names.Delete("fontPoints");
@@ -1608,6 +1647,21 @@ wxProperty *wxPanelPropertyInfo::GetProperty(wxString& name)
      else
          return new wxProperty(name, "Could not get title", "string");
    }
      else
          return new wxProperty(name, "Could not get title", "string");
    }
+  else if (name == "caption")
+  {
+    return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxCAPTION) == wxCAPTION),
+        "bool");
+  }
+  else if (name == "systemMenu")
+  {
+    return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxSYSTEM_MENU) == wxSYSTEM_MENU),
+        "bool");
+  }
+  else if (name == "thickFrame")
+  {
+    return new wxProperty(name, ((panelWindow->GetWindowStyleFlag() & wxTHICK_FRAME) == wxTHICK_FRAME),
+        "bool");
+  }
    else
      return wxWindowPropertyInfo::GetProperty(name);
  }
    else
      return wxWindowPropertyInfo::GetProperty(name);
  }
@@ -1676,6 +1730,30 @@ bool wxPanelPropertyInfo::SetProperty(wxString& name, wxProperty *property)
      else
          return FALSE;
    }
      else
          return FALSE;
    }
+  else if (name == "caption")
+  {
+    SetWindowStyle(panelWindow, wxCAPTION, property->GetValue().BoolValue());
+
+    wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+    resource->SetStyle(panelWindow->GetWindowStyleFlag());
+    return TRUE;
+  }
+  else if (name == "thickFrame")
+  {
+    SetWindowStyle(panelWindow, wxTHICK_FRAME, property->GetValue().BoolValue());
+
+    wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+    resource->SetStyle(panelWindow->GetWindowStyleFlag());
+    return TRUE;
+  }
+  else if (name == "systemMenu")
+  {
+    SetWindowStyle(panelWindow, wxSYSTEM_MENU, property->GetValue().BoolValue());
+
+    wxItemResource *resource = wxResourceManager::GetCurrentResourceManager()->FindResourceForWindow(panelWindow);
+    resource->SetStyle(panelWindow->GetWindowStyleFlag());
+    return TRUE;
+  }
    else
      return wxWindowPropertyInfo::SetProperty(name, property);
  }
    else
      return wxWindowPropertyInfo::SetProperty(name, property);
  }
@@ -1687,6 +1765,9 @@ void wxPanelPropertyInfo::GetPropertyNames(wxStringList& names)
    names.Add("title");
    names.Add("no3D");
    names.Add("backgroundColour");
    names.Add("title");
    names.Add("no3D");
    names.Add("backgroundColour");
+  names.Add("caption");
+  names.Add("systemMenu");
+  names.Add("thickFrame");
  }
  
  bool wxPanelPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxPanelPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1742,10 +1823,9 @@ bool wxDialogPropertyInfo::SetProperty(wxString& name, wxProperty *property)
  
  void wxDialogPropertyInfo::GetPropertyNames(wxStringList& names)
  {
  
  void wxDialogPropertyInfo::GetPropertyNames(wxStringList& names)
  {
+  wxPanelPropertyInfo::GetPropertyNames(names);
    names.Add("title");
    names.Add("modal");
    names.Add("title");
    names.Add("modal");
-
-  wxPanelPropertyInfo::GetPropertyNames(names);
  }
  
  bool wxDialogPropertyInfo::InstantiateResource(wxItemResource *resource)
  }
  
  bool wxDialogPropertyInfo::InstantiateResource(wxItemResource *resource)
@@ -1884,24 +1964,6 @@ void wxResourceSymbolValidator::OnEdit(wxProperty *property, wxPropertyListView
      view->UpdatePropertyDisplayInList(property);
      view->OnPropertyChanged(property);
    }
      view->UpdatePropertyDisplayInList(property);
      view->OnPropertyChanged(property);
    }
-
-#if 0
-  char *s = wxFileSelector(
-     filenameMessage.GetData(),
-     wxPathOnly(property->GetValue().StringValue()),
-     wxFileNameFromPath(property->GetValue().StringValue()),
-     NULL,
-     filenameWildCard.GetData(),
-     0,
-     parentWindow);
-  if (s)
-  {
-    property->GetValue() = wxString(s);
-    view->DisplayProperty(property);
-    view->UpdatePropertyDisplayInList(property);
-    view->OnPropertyChanged(property);
-  }
-#endif
  }
  
  BEGIN_EVENT_TABLE(wxResourceSymbolDialog, wxDialog)
  }
  
  BEGIN_EVENT_TABLE(wxResourceSymbolDialog, wxDialog)
@@ -1922,7 +1984,7 @@ wxResourceSymbolDialog::wxResourceSymbolDialog(wxWindow* parent, const wxWindowI
      x += 80;
  
      m_nameCtrl = new wxComboBox(this, ID_SYMBOLNAME_COMBOBOX, "",
      x += 80;
  
      m_nameCtrl = new wxComboBox(this, ID_SYMBOLNAME_COMBOBOX, "",
-        wxPoint(x, y), wxSize(200, -1), 0, NULL, wxCB_DROPDOWN);
+        wxPoint(x, y), wxSize(200, -1), 0, NULL, wxCB_DROPDOWN|wxCB_SORT);
  
      y += 30;
      x = 5;
  
      y += 30;
      x = 5;
@@ -2041,7 +2103,7 @@ bool wxResourceSymbolDialog::CheckValues()
  
  void wxResourceSymbolDialog::OnComboBoxSelect(wxCommandEvent& event)
  {
  
  void wxResourceSymbolDialog::OnComboBoxSelect(wxCommandEvent& event)
  {
-    wxString str(m_nameCtrl->GetValue());
+    wxString str(m_nameCtrl->GetStringSelection());
      if (wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().IsStandardSymbol(str))
      {
          int id = wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().GetIdForSymbol(str);
      if (wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().IsStandardSymbol(str))
      {
          int id = wxResourceManager::GetCurrentResourceManager()->GetSymbolTable().GetIdForSymbol(str);
diff --git a/utils/dialoged/src/winprop.h b/utils/dialoged/src/winprop.h

index d8a95cdd376b36d0ec4a68e6a47f669b08746617..1cca46cf7b053c529dfca85c8d38300d117ef622 100644 (file)
--- a/utils/dialoged/src/winprop.h
+++ b/utils/dialoged/src/winprop.h
@@ -20,14 +20,14 @@
  
  class wxPropertyInfo;
  
  
  class wxPropertyInfo;
  
-class wxDialogEditorPropertyListDialog: public wxPropertyListDialog
+class wxDialogEditorPropertyListFrame: public wxPropertyListFrame
  {
      friend class wxPropertyInfo;
  public:
  {
      friend class wxPropertyInfo;
  public:
-    wxDialogEditorPropertyListDialog(wxPropertyListView *v, wxWindow *parent, const wxString& title,
+    wxDialogEditorPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
          const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
          const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox");
-    ~wxDialogEditorPropertyListDialog();
+        long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
+    ~wxDialogEditorPropertyListFrame();
  
  private:
      wxPropertySheet*            m_propSheet;
  
  private:
      wxPropertySheet*            m_propSheet;
@@ -57,7 +57,7 @@ class wxResourcePropertyListView: public wxPropertyListView
  // them with separate classes.
  class wxPropertyInfo: public wxObject
  {
  // them with separate classes.
  class wxPropertyInfo: public wxObject
  {
-    friend class wxDialogEditorPropertyListDialog;
+    friend class wxDialogEditorPropertyListFrame;
   protected:
    static wxWindow *sm_propertyWindow;
    wxPropertyInfo(void)
   protected:
    static wxWindow *sm_propertyWindow;
    wxPropertyInfo(void)
@@ -97,6 +97,9 @@ class wxWindowPropertyInfo: public wxPropertyInfo
    
    // Fill in the wxItemResource members to mirror the current window settings
    virtual bool InstantiateResource(wxItemResource *resource);
    
    // Fill in the wxItemResource members to mirror the current window settings
    virtual bool InstantiateResource(wxItemResource *resource);
+
+  // Set the window style
+  void SetWindowStyle(wxWindow* win, long style, bool set);
  };
  
  // For panel items
  };
  
  // For panel items
diff --git a/utils/ogl/distrib/zipogl.bat b/utils/ogl/distrib/zipogl.bat

index 05c58347cf89b81bd5ce9e67a4caee8ad2f48310..37f3e3bf946ce0fc5d7ee24223157ab697db280e 100755 (executable)
--- a/utils/ogl/distrib/zipogl.bat
+++ b/utils/ogl/distrib/zipogl.bat
@@ -1,17 +1,19 @@
  @echo off
  rem Zip up an external distribution of OGL
  @echo off
  rem Zip up an external distribution of OGL
+set src=d:\wx2\wxWindows\utils\ogl
+set dest=%src\deliver
  
  
-if "%1" == "" goto usage
-if "%2" == "" goto usage
+if "%src" == "" goto usage
+if "%dest" == "" goto usage
  echo About to archive an external OGL distribution:
  echo About to archive an external OGL distribution:
-echo   From   %1
-echo   To     %2\ogl.zip
+echo   From   %src
+echo   To     %dest\ogl.zip
  echo CTRL-C if this is not correct.
  inkey /W4 `Press any key to continue...` %%input
  
  echo CTRL-C if this is not correct.
  inkey /W4 `Press any key to continue...` %%input
  
-erase %2\ogl.zip
-cd %1
-zip -P %3 %4 %5 %6 %7 %8 %2\ogl.zip @%1\distrib\ogl.rsp
+erase %dest\ogl.zip
+cd %src
+zip32 -@ %dest\ogl.zip < %src\distrib\ogl.rsp
  
  echo OGL archived.
  goto end
  
  echo OGL archived.
  goto end
diff --git a/utils/wxprop/src/proplist.cpp b/utils/wxprop/src/proplist.cpp

index 2b8ba2555bf06ab2df7530f14f3f8d803c217e53..db2ec2d06ac94515a54846f8e0bc4eac94032524 100644 (file)
--- a/utils/wxprop/src/proplist.cpp
+++ b/utils/wxprop/src/proplist.cpp
@@ -396,7 +396,7 @@ bool wxPropertyListView::CreateControls(void)
  {
    wxPanel *panel = (wxPanel *)propertyWindow;
  
  {
    wxPanel *panel = (wxPanel *)propertyWindow;
  
-  int largeButtonWidth = 50;
+  int largeButtonWidth = 60;
    int largeButtonHeight = 25;
  
    int smallButtonWidth = 25;
    int largeButtonHeight = 25;
  
    int smallButtonWidth = 25;
@@ -424,11 +424,17 @@ bool wxPropertyListView::CreateControls(void)
    wxSystemSettings settings;
    wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
  
    wxSystemSettings settings;
    wxFont guiFont = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
  
+#ifdef __WXMSW__
+  wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxNORMAL, FALSE, "Courier New");
+#else
    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL);
    wxFont *boringFont = wxTheFontList->FindOrCreateFont(guiFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL);
+#endif
  
    // May need to be changed in future to eliminate clashes with app.
    panel->SetClientData((char *)this);
  
  
    // May need to be changed in future to eliminate clashes with app.
    panel->SetClientData((char *)this);
  
+  // These buttons are at the bottom of the window, but create them now
+  // so the constraints are evaluated in the correct order
    if (buttonFlags & wxPROP_BUTTON_OK)
    {
      windowCloseButton = new wxButton(panel, wxID_OK, "OK",
    if (buttonFlags & wxPROP_BUTTON_OK)
    {
      windowCloseButton = new wxButton(panel, wxID_OK, "OK",
@@ -436,7 +442,7 @@ bool wxPropertyListView::CreateControls(void)
      windowCloseButton->SetDefault();
      windowCloseButton->SetFocus();
    }
      windowCloseButton->SetDefault();
      windowCloseButton->SetFocus();
    }
-  if (buttonFlags & wxPROP_BUTTON_CLOSE)
+  else if (buttonFlags & wxPROP_BUTTON_CLOSE)
    {
      windowCloseButton = new wxButton(panel, wxID_OK, "Close",
       wxPoint(-1, -1), wxSize(largeButtonWidth, largeButtonHeight));
    {
      windowCloseButton = new wxButton(panel, wxID_OK, "Close",
       wxPoint(-1, -1), wxSize(largeButtonWidth, largeButtonHeight));
@@ -455,8 +461,9 @@ bool wxPropertyListView::CreateControls(void)
    if (windowCloseButton)
    {
      wxLayoutConstraints *c1 = new wxLayoutConstraints;
    if (windowCloseButton)
    {
      wxLayoutConstraints *c1 = new wxLayoutConstraints;
+
      c1->left.SameAs       (panel, wxLeft, 2);
      c1->left.SameAs       (panel, wxLeft, 2);
-    c1->top.SameAs        (panel, wxTop, 2);
+    c1->bottom.SameAs        (panel, wxBottom, 2);
      c1->width.AsIs();
      c1->height.AsIs();
      windowCloseButton->SetConstraints(c1);
      c1->width.AsIs();
      c1->height.AsIs();
      windowCloseButton->SetConstraints(c1);
@@ -465,12 +472,9 @@ bool wxPropertyListView::CreateControls(void)
    if (windowCancelButton)
    {
      wxLayoutConstraints *c2 = new wxLayoutConstraints;
    if (windowCancelButton)
    {
      wxLayoutConstraints *c2 = new wxLayoutConstraints;
-    if (leftMostWindow == panel)
-      c2->left.SameAs       (panel, wxLeft, 2);
-    else
-      c2->left.RightOf      (leftMostWindow, 2);
-      
-    c2->top.SameAs          (panel, wxTop, 2);
+
+    c2->right.SameAs       (panel, wxRight, 2);
+    c2->bottom.SameAs          (panel, wxBottom, 2);
      c2->width.AsIs();
      c2->height.AsIs();
      windowCancelButton->SetConstraints(c2);
      c2->width.AsIs();
      c2->height.AsIs();
      windowCancelButton->SetConstraints(c2);
@@ -484,7 +488,7 @@ bool wxPropertyListView::CreateControls(void)
      else
        c2->left.RightOf      (leftMostWindow, 2);
        
      else
        c2->left.RightOf      (leftMostWindow, 2);
        
-    c2->top.SameAs          (panel, wxTop, 2);
+    c2->bottom.SameAs          (panel, wxBottom, 2);
      c2->width.AsIs();
      c2->height.AsIs();
      windowHelpButton->SetConstraints(c2);
      c2->width.AsIs();
      c2->height.AsIs();
      windowHelpButton->SetConstraints(c2);
@@ -530,9 +534,11 @@ bool wxPropertyListView::CreateControls(void)
  
      wxLayoutConstraints *c = new wxLayoutConstraints;
      c->left.SameAs         (panel, wxLeft, 2);
  
      wxLayoutConstraints *c = new wxLayoutConstraints;
      c->left.SameAs         (panel, wxLeft, 2);
+/*
      if (windowCloseButton)
        c->top.Below         (windowCloseButton, 2);
      else
      if (windowCloseButton)
        c->top.Below         (windowCloseButton, 2);
      else
+*/
        c->top.SameAs        (panel, wxTop, 2);
  
      c->width.AsIs();
        c->top.SameAs        (panel, wxTop, 2);
  
      c->width.AsIs();
@@ -559,9 +565,11 @@ bool wxPropertyListView::CreateControls(void)
      editButton->Enable(FALSE);
      wxLayoutConstraints *c = new wxLayoutConstraints;
  
      editButton->Enable(FALSE);
      wxLayoutConstraints *c = new wxLayoutConstraints;
  
+/*
      if (windowCloseButton)
        c->top.Below           (windowCloseButton, 2);
      else
      if (windowCloseButton)
        c->top.Below           (windowCloseButton, 2);
      else
+*/
        c->top.SameAs          (panel, wxTop, 2);
  
      c->right.SameAs          (panel, wxRight, 2);
        c->top.SameAs          (panel, wxTop, 2);
  
      c->right.SameAs          (panel, wxRight, 2);
@@ -579,10 +587,11 @@ bool wxPropertyListView::CreateControls(void)
      c->left.RightOf        (confirmButton, 2);
    else
      c->left.SameAs         (panel, wxLeft, 2);
      c->left.RightOf        (confirmButton, 2);
    else
      c->left.SameAs         (panel, wxLeft, 2);
-
+/*
    if (windowCloseButton)
      c->top.Below           (windowCloseButton, 2);
    else
    if (windowCloseButton)
      c->top.Below           (windowCloseButton, 2);
    else
+*/
      c->top.SameAs          (panel, wxTop, 2);
  
    if (editButton)
      c->top.SameAs          (panel, wxTop, 2);
  
    if (editButton)
@@ -619,10 +628,15 @@ bool wxPropertyListView::CreateControls(void)
      c->top.Below         (valueList, 2);
  
    c->right.SameAs        (panel, wxRight, 2);
      c->top.Below         (valueList, 2);
  
    c->right.SameAs        (panel, wxRight, 2);
-  c->bottom.SameAs       (panel, wxBottom, 2);
+
+  if (windowCloseButton)
+    c->bottom.Above       (windowCloseButton, -2);
+  else
+    c->bottom.SameAs       (panel, wxBottom, 2);
  
    propertyScrollingList->SetConstraints(c);
  
  
    propertyScrollingList->SetConstraints(c);
  
+
    // Note: if this is called now, it causes a GPF.
    // Why?
  //  panel->Layout();
    // Note: if this is called now, it causes a GPF.
    // Why?
  //  panel->Layout();
@@ -830,6 +844,10 @@ bool wxPropertyListDialog::ProcessEvent(wxEvent& event)
   
  IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
  
   
  IMPLEMENT_CLASS(wxPropertyListPanel, wxPanel)
  
+BEGIN_EVENT_TABLE(wxPropertyListPanel, wxPanel)
+    EVT_SIZE(wxPropertyListPanel::OnSize)
+END_EVENT_TABLE()
+
  void wxPropertyListPanel::OnDefaultAction(wxControl *item)
  {
  /*
  void wxPropertyListPanel::OnDefaultAction(wxControl *item)
  {
  /*
@@ -847,6 +865,11 @@ bool wxPropertyListPanel::ProcessEvent(wxEvent& event)
                 return TRUE;
  }
  
                 return TRUE;
  }
  
+void wxPropertyListPanel::OnSize(wxSizeEvent& event)
+{
+    Layout();
+}
+
  /*
   * Property frame
   */
  /*
   * Property frame
   */
@@ -856,12 +879,18 @@ IMPLEMENT_CLASS(wxPropertyListFrame, wxFrame)
  bool wxPropertyListFrame::OnClose(void)
  {
    if (view)
  bool wxPropertyListFrame::OnClose(void)
  {
    if (view)
-    return view->OnClose();
+  {
+    if (propertyPanel)
+        propertyPanel->SetView(NULL);
+    view->OnClose();
+    view = NULL;
+    return TRUE;
+  }
    else
      return FALSE;
  }
  
    else
      return FALSE;
  }
  
-wxPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
+wxPropertyListPanel *wxPropertyListFrame::OnCreatePanel(wxFrame *parent, wxPropertyListView *v)
  {
    return new wxPropertyListPanel(v, parent);
  }
  {
    return new wxPropertyListPanel(v, parent);
  }
diff --git a/utils/wxprop/src/proplist.h b/utils/wxprop/src/proplist.h

index 15f1243458543bf3cf3c0f599d35a3d458d54b53..d6dd9ed258892ddef08b50d15a1b931fd383c7e1 100644 (file)
--- a/utils/wxprop/src/proplist.h
+++ b/utils/wxprop/src/proplist.h
@@ -303,8 +303,16 @@ class wxPropertyListPanel: public wxPanel
    }
    void OnDefaultAction(wxControl *item);
  
    }
    void OnDefaultAction(wxControl *item);
  
+  inline void SetView(wxPropertyListView* v) { view = v; }
+  inline wxPropertyListView* GetView() const { return view; }
+
    // Extend event processing to search the view's event table
    virtual bool ProcessEvent(wxEvent& event);
    // Extend event processing to search the view's event table
    virtual bool ProcessEvent(wxEvent& event);
+
+  // Call Layout()
+  void OnSize(wxSizeEvent& event);
+
+DECLARE_EVENT_TABLE()
  };
  
  /*
  };
  
  /*
@@ -316,7 +324,7 @@ class wxPropertyListFrame: public wxFrame
    DECLARE_CLASS(wxPropertyListFrame)
   private:
    wxPropertyListView *view;
    DECLARE_CLASS(wxPropertyListFrame)
   private:
    wxPropertyListView *view;
-  wxPanel *propertyPanel;
+  wxPropertyListPanel *propertyPanel;
   public:
    wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
   public:
    wxPropertyListFrame(wxPropertyListView *v, wxFrame *parent, const wxString& title,
      const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
@@ -330,8 +338,8 @@ class wxPropertyListFrame: public wxFrame
  
    // Must call this to create panel and associate view
    virtual bool Initialize(void);
  
    // Must call this to create panel and associate view
    virtual bool Initialize(void);
-  virtual wxPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
-  inline virtual wxPanel *GetPropertyPanel(void) { return propertyPanel; }
+  virtual wxPropertyListPanel *OnCreatePanel(wxFrame *parent, wxPropertyListView *v);
+  inline virtual wxPropertyListPanel *GetPropertyPanel(void) { return propertyPanel; }
  };
  
  /*
  };
  
  /*
author	Julian Smart <julian@anthemion.co.uk>
	Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)
committer	Julian Smart <julian@anthemion.co.uk>
	Fri, 7 Aug 1998 23:52:45 +0000 (23:52 +0000)
distrib/msw/generic.rsp		patch \| blob \| blame \| history
distrib/msw/gtk.rsp		patch \| blob \| blame \| history
distrib/msw/zipdist.bat		patch \| blob \| blame \| history
docs/latex/wx/dialog.tex		patch \| blob \| blame \| history
docs/latex/wx/treectrl.tex		patch \| blob \| blame \| history
include/wx/msw/app.h		patch \| blob \| blame \| history
include/wx/msw/bitmap.h		patch \| blob \| blame \| history
include/wx/msw/bmpbuttn.h		patch \| blob \| blame \| history
include/wx/msw/brush.h		patch \| blob \| blame \| history
include/wx/msw/button.h		patch \| blob \| blame \| history
include/wx/msw/checkbox.h		patch \| blob \| blame \| history
include/wx/msw/checklst.h		patch \| blob \| blame \| history
include/wx/msw/choice.h		patch \| blob \| blame \| history
include/wx/msw/clipbrd.h		patch \| blob \| blame \| history
include/wx/msw/colordlg.h		patch \| blob \| blame \| history
include/wx/msw/colour.h		patch \| blob \| blame \| history
include/wx/msw/combobox.h		patch \| blob \| blame \| history
include/wx/msw/control.h		patch \| blob \| blame \| history
include/wx/msw/curico.h		patch \| blob \| blame \| history
include/wx/msw/cursor.h		patch \| blob \| blame \| history
include/wx/msw/dc.h		patch \| blob \| blame \| history
include/wx/msw/dcclient.h		patch \| blob \| blame \| history
include/wx/msw/dcmemory.h		patch \| blob \| blame \| history
include/wx/msw/dcprint.h		patch \| blob \| blame \| history
include/wx/msw/dcscreen.h		patch \| blob \| blame \| history
include/wx/msw/dde.h		patch \| blob \| blame \| history
include/wx/msw/dialog.h		patch \| blob \| blame \| history
include/wx/msw/dib.h		patch \| blob \| blame \| history
include/wx/msw/dibutils.h		patch \| blob \| blame \| history
include/wx/msw/dirdlg.h		patch \| blob \| blame \| history
include/wx/msw/filedlg.h		patch \| blob \| blame \| history
include/wx/msw/font.h		patch \| blob \| blame \| history
include/wx/msw/fontdlg.h		patch \| blob \| blame \| history
include/wx/msw/frame.h		patch \| blob \| blame \| history
include/wx/msw/gauge.h		patch \| blob \| blame \| history
include/wx/msw/gauge95.h		patch \| blob \| blame \| history
include/wx/msw/gaugemsw.h		patch \| blob \| blame \| history
include/wx/msw/gdiobj.h		patch \| blob \| blame \| history
include/wx/msw/helpwin.h		patch \| blob \| blame \| history
include/wx/msw/icon.h		patch \| blob \| blame \| history
include/wx/msw/imaglist.h		patch \| blob \| blame \| history
include/wx/msw/iniconf.h		patch \| blob \| blame \| history
include/wx/msw/joystick.h		patch \| blob \| blame \| history
include/wx/msw/listbox.h		patch \| blob \| blame \| history
include/wx/msw/listctrl.h		patch \| blob \| blame \| history
include/wx/msw/mdi.h		patch \| blob \| blame \| history
include/wx/msw/menu.h		patch \| blob \| blame \| history
include/wx/msw/metafile.h		patch \| blob \| blame \| history
include/wx/msw/minifram.h		patch \| blob \| blame \| history
include/wx/msw/msgdlg.h		patch \| blob \| blame \| history
include/wx/msw/ole/dataobj.h		patch \| blob \| blame \| history
include/wx/msw/ole/dropsrc.h		patch \| blob \| blame \| history
include/wx/msw/ole/droptgt.h		patch \| blob \| blame \| history
include/wx/msw/ole/oleutils.h		patch \| blob \| blame \| history
include/wx/msw/ole/uuid.h		patch \| blob \| blame \| history
include/wx/msw/palette.h		patch \| blob \| blame \| history
include/wx/msw/pen.h		patch \| blob \| blame \| history
include/wx/msw/pnghand.h		patch \| blob \| blame \| history
include/wx/msw/pngread.h		patch \| blob \| blame \| history
include/wx/msw/printdlg.h		patch \| blob \| blame \| history
include/wx/msw/printwin.h		patch \| blob \| blame \| history
include/wx/msw/private.h		patch \| blob \| blame \| history
include/wx/msw/radiobox.h		patch \| blob \| blame \| history
include/wx/msw/radiobut.h		patch \| blob \| blame \| history
include/wx/msw/regconf.h		patch \| blob \| blame \| history
include/wx/msw/region.h		patch \| blob \| blame \| history
include/wx/msw/registry.h		patch \| blob \| blame \| history
include/wx/msw/scrolbar.h		patch \| blob \| blame \| history
include/wx/msw/settings.h		patch \| blob \| blame \| history
include/wx/msw/setup.h		patch \| blob \| blame \| history
include/wx/msw/slider.h		patch \| blob \| blame \| history
include/wx/msw/slider95.h		patch \| blob \| blame \| history
include/wx/msw/slidrmsw.h		patch \| blob \| blame \| history
include/wx/msw/spinbutt.h		patch \| blob \| blame \| history
include/wx/msw/statbmp.h		patch \| blob \| blame \| history
include/wx/msw/statbox.h		patch \| blob \| blame \| history
include/wx/msw/statbr95.h		patch \| blob \| blame \| history
include/wx/msw/stattext.h		patch \| blob \| blame \| history
include/wx/msw/tabctrl.h		patch \| blob \| blame \| history
include/wx/msw/tbar95.h		patch \| blob \| blame \| history
include/wx/msw/tbarmsw.h		patch \| blob \| blame \| history
include/wx/msw/textctrl.h		patch \| blob \| blame \| history
include/wx/msw/timer.h		patch \| blob \| blame \| history
include/wx/msw/treectrl.h		patch \| blob \| blame \| history
include/wx/msw/wave.h		patch \| blob \| blame \| history
include/wx/msw/window.h		patch \| blob \| blame \| history
src/common/resource.cpp		patch \| blob \| blame \| history
src/msw/app.cpp		patch \| blob \| blame \| history
src/msw/choice.cpp		patch \| blob \| blame \| history
src/msw/colordlg.cpp		patch \| blob \| blame \| history
src/msw/combobox.cpp		patch \| blob \| blame \| history
src/msw/dialog.cpp		patch \| blob \| blame \| history
src/msw/fontdlg.cpp		patch \| blob \| blame \| history
src/msw/listctrl.cpp		patch \| blob \| blame \| history
src/msw/mdi.cpp		patch \| blob \| blame \| history
src/msw/minifram.cpp		patch \| blob \| blame \| history
src/msw/treectrl.cpp		patch \| blob \| blame \| history
src/msw/window.cpp		patch \| blob \| blame \| history
utils/dialoged/src/makefile.b32		patch \| blob \| blame \| history
utils/dialoged/src/makefile.g95		patch \| blob \| blame \| history
utils/dialoged/src/makefile.nt		patch \| blob \| blame \| history
utils/dialoged/src/reseditr.cpp		patch \| blob \| blame \| history
utils/dialoged/src/reseditr.h		patch \| blob \| blame \| history
utils/dialoged/src/reswrite.cpp		patch \| blob \| blame \| history
utils/dialoged/src/symbtabl.cpp		patch \| blob \| blame \| history
utils/dialoged/src/winprop.cpp		patch \| blob \| blame \| history
utils/dialoged/src/winprop.h		patch \| blob \| blame \| history
utils/ogl/distrib/zipogl.bat		patch \| blob \| blame \| history
utils/wxprop/src/proplist.cpp		patch \| blob \| blame \| history
utils/wxprop/src/proplist.h		patch \| blob \| blame \| history