Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
plus wxTreeCtrl::EditLabel/EndEditLabel, dialog editor stuff, wxMSW header changes,
doc changes. Sorry about the quantity :-(


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-08-07 23:52:45 +00:00
parent c2d8daeb4a
commit bbcdf8bc7c
110 changed files with 1009 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
distrib/msw/generic.rsp
View File

@@ -9,6 +9,9 @@ docs/todo.txt
docs/licence.txt
docs/symbols.txt
src/*.inc
src/mkdir
src/common/*.cpp
src/common/dosyacc.c
src/common/doslex.c
@@ -205,22 +208,22 @@ utils/dialoged/test/*.bmp
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/makefile.*
samples/dynamic/makefile*.*
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/makefile.*
samples/bombs/makefile*.*
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/makefile.*
samples/ipc/makefile*.*
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/makefile.*
samples/types/makefile*.*
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/makefile.*
samples/resource/makefile*.*
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/makefile.*
samples/animate/makefile*.*
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/makefile.*
samples/mdi/makefile*.*
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/makefile.*
samples/minimal/makefile*.*
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/makefile.*
samples/controls/makefile*.*
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/makefile.*
samples/fractal/makefile*.*
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/makefile.*
samples/layout/makefile*.*
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/makefile.*
samples/printing/makefile*.*
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/makefile.*
samples/toolbar/makefile*.*
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/makefile.*
samples/docview/makefile*.*
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/makefile.*
samples/memcheck/makefile*.*
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/makefile.*
samples/odbc/makefile*.*
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/makefile.*
samples/dialogs/makefile*.*
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/makefile.*
samples/wxpoem/makefile*.*
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/makefile.*
samples/pressup/makefile*.*
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/makefile.*
samples/validate/makefile*.*
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/makefile.*
samples/events/makefile*.*
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/makefile.*
samples/treectrl/makefile*.*
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/makefile.*
samples/listctrl/makefile*.*
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/makefile.*
samples/splitter/makefile*.*
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/makefile.*
samples/grid/makefile*.*
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/makefile.*
samples/internat/makefile*.*
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/makefile.*
samples/checklst/makefile*.*
samples/checklst/*.xbm
samples/checklst/*.xpm
samples/checklst/*.ico
@@ -528,7 +531,7 @@ samples/checklst/*.bmp
samples/dnd/*.cpp
samples/dnd/*.h
samples/dnd/makefile.*
samples/dnd/makefile*.*
samples/dnd/*.rc
samples/dnd/*.def
samples/dnd/*.bmp
@@ -539,7 +542,7 @@ samples/dnd/*.txt
samples/tab/*.cpp
samples/tab/*.h
samples/tab/makefile.*
samples/tab/makefile*.*
samples/tab/*.rc
samples/tab/*.def
samples/tab/*.bmp
@@ -550,7 +553,7 @@ samples/tab/*.txt
samples/png/*.cpp
samples/png/*.h
samples/png/makefile.*
samples/png/makefile*.*
samples/png/*.rc
samples/png/*.def
samples/png/*.bmp

13
distrib/msw/gtk.rsp
View File

@@ -8,6 +8,7 @@ docs/gtk/*.html
src/mkdirs
src/Makefile
src/Makefile.in
src/*.inc
src/gtk/*.cpp
src/gtk/*.c
@@ -28,6 +29,18 @@ src/gdk_imlib/COPYING.LIB
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/*

30
distrib/msw/zipdist.bat
View File

@@ -1,27 +1,29 @@
@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 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
erase %2\wx200*.zip
erase %dest\wx200*.zip
cd %1
cd %src
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

5
docs/latex/wx/dialog.tex
View File

@@ -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{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}

27
docs/latex/wx/treectrl.tex
View File

@@ -111,12 +111,35 @@ Deletes all the items in the control.
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.
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}}

10
include/wx/msw/app.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __APPH__
#define __APPH__
#ifndef _WX_APP_H_
#define _WX_APP_H_
#ifdef __GNUG__
#pragma interface "app.h"
@@ -162,5 +162,5 @@ int WXDLLEXPORT wxEntry(WXHINSTANCE hInstance);
#endif
#endif
// __APPH__
// _WX_APP_H_

10
include/wx/msw/bitmap.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __BITMAPH__
#define __BITMAPH__
#ifndef _WX_BITMAP_H_
#define _WX_BITMAP_H_
#ifdef __GNUG__
#pragma interface "bitmap.h"
@@ -199,4 +199,4 @@ public:
};
#endif
// __BITMAPH__
// _WX_BITMAP_H_

10
include/wx/msw/bmpbuttn.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __BMPBUTTNH__
#define __BMPBUTTNH__
#ifndef _WX_BMPBUTTN_H_
#define _WX_BMPBUTTN_H_
#ifdef __GNUG__
#pragma interface "bmpbuttn.h"
@@ -82,4 +82,4 @@ class WXDLLEXPORT wxBitmapButton: public wxButton
};
#endif
// __BMPBUTTNH__
// _WX_BMPBUTTN_H_

10
include/wx/msw/brush.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __BRUSHH__
#define __BRUSHH__
#ifndef _WX_BRUSH_H_
#define _WX_BRUSH_H_
#ifdef __GNUG__
#pragma interface "brush.h"
@@ -81,4 +81,4 @@ public:
};
#endif
// __BRUSHH__
// _WX_BRUSH_H_

10
include/wx/msw/button.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __BUTTONH__
#define __BUTTONH__
#ifndef _WX_BUTTON_H_
#define _WX_BUTTON_H_
#ifdef __GNUG__
#pragma interface "button.h"
@@ -53,4 +53,4 @@ class WXDLLEXPORT wxButton: public wxControl
};
#endif
// __BUTTONH__
// _WX_BUTTON_H_

10
include/wx/msw/checkbox.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __CHECKBOXH__
#define __CHECKBOXH__
#ifndef _WX_CHECKBOX_H_
#define _WX_CHECKBOX_H_
#ifdef __GNUG__
#pragma interface "checkbox.h"
@@ -81,4 +81,4 @@ class WXDLLEXPORT wxBitmapCheckBox: public wxCheckBox
virtual void SetLabel(const wxBitmap *bitmap);
};
#endif
// __CHECKBOXH__
// _WX_CHECKBOX_H_

6
include/wx/msw/checklst.h
View File

@@ -6,11 +6,11 @@
// Created: 16.11.97
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __CHECKLST_H__
#define __CHECKLST_H__
#ifndef __CHECKLST__H_
#define __CHECKLST__H_
#ifdef __GNUG__
#pragma interface "checklst.h"

20
include/wx/msw/choice.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __CHOICEH__
#define __CHOICEH__
#ifndef _WX_CHOICE_H_
#define _WX_CHOICE_H_
#ifdef __GNUG__
#pragma interface "choice.h"
@@ -26,9 +26,7 @@ class WXDLLEXPORT wxChoice: public wxControl
DECLARE_DYNAMIC_CLASS(wxChoice)
public:
int no_strings;
inline wxChoice(void) { no_strings = 0; }
inline wxChoice(void) { m_noStrings = 0; }
inline wxChoice(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
@@ -60,7 +58,7 @@ class WXDLLEXPORT wxChoice: public wxControl
virtual wxString GetStringSelection(void) const ;
virtual bool SetStringSelection(const wxString& sel);
virtual inline int Number(void) const { return no_strings; }
virtual inline int Number(void) const { return m_noStrings; }
virtual void Command(wxCommandEvent& event);
virtual bool MSWCommand(WXUINT param, WXWORD id);
@@ -72,7 +70,11 @@ class WXDLLEXPORT wxChoice: public wxControl
WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
protected:
int m_noStrings;
};
#endif
// __CHOICEH__
// _WX_CHOICE_H_

10
include/wx/msw/clipbrd.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __CLIPBRDH__
#define __CLIPBRDH__
#ifndef _WX_CLIPBRD_H_
#define _WX_CLIPBRD_H_
#ifdef __GNUG__
#pragma interface "clipbrd.h"
@@ -108,4 +108,4 @@ extern wxClipboard* WXDLLEXPORT wxTheClipboard;
#endif // USE_CLIPBOARD
#endif
// __CLIPBRDH__
// _WX_CLIPBRD_H_

31
include/wx/msw/colordlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COLORDLGH__
#define __COLORDLGH__
#ifndef _WX_COLORDLG_H_
#define _WX_COLORDLG_H_
#ifdef __GNUG__
#pragma interface "colordlg.h"
@@ -26,19 +26,20 @@
class WXDLLEXPORT wxColourDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxColourDialog)
protected:
wxColourData colourData;
wxWindow *dialogParent;
public:
wxColourDialog(void);
wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
DECLARE_DYNAMIC_CLASS(wxColourDialog)
public:
wxColourDialog(void);
wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
bool Create(wxWindow *parent, wxColourData *data = NULL);
bool Create(wxWindow *parent, wxColourData *data = NULL);
int ShowModal(void);
wxColourData& GetColourData(void) { return colourData; }
int ShowModal(void);
wxColourData& GetColourData(void) { return m_colourData; }
protected:
wxColourData m_colourData;
wxWindow* m_dialogParent;
};
#endif
// __COLORDLGH__
// _WX_COLORDLG_H_

8
include/wx/msw/colour.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COLOURH__
#define __COLOURH__
#ifndef _WX_COLOUR_H_
#define _WX_COLOUR_H_
#ifdef __GNUG__
#pragma interface "colour.h"
@@ -68,4 +68,4 @@ public:
#define wxColor wxColour
#endif
// __COLOURH__
// _WX_COLOUR_H_

10
include/wx/msw/combobox.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __COMBOBOXH__
#define __COMBOBOXH__
#ifndef _WX_COMBOBOX_H_
#define _WX_COMBOBOX_H_
#ifdef __GNUG__
#pragma interface "combobox.h"
@@ -80,4 +80,4 @@ class WXDLLEXPORT wxComboBox: public wxChoice
#endif // USE_COMBOBOX
#endif
// __COMBOBOXH__
// _WX_COMBOBOX_H_

10
include/wx/msw/control.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __CONTROLH__
#define __CONTROLH__
#ifndef _WX_CONTROL_H_
#define _WX_CONTROL_H_
#ifdef __GNUG__
#pragma interface "control.h"
@@ -83,4 +83,4 @@ inline void wxControl::SetButtonFont(const wxFont& font) { SetFont(font); }
#endif
#endif
// __CONTROLH__
// _WX_CONTROL_H_

4
include/wx/msw/curico.h
View File

@@ -5,8 +5,8 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
HICON ReadIconFile( char *szFileName, HINSTANCE hInst,

10
include/wx/msw/cursor.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __CURSORH__
#define __CURSORH__
#ifndef _WX_CURSOR_H_
#define _WX_CURSOR_H_
#ifdef __GNUG__
#pragma interface "cursor.h"
@@ -66,4 +66,4 @@ public:
};
#endif
// __CURSORH__
// _WX_CURSOR_H_

10
include/wx/msw/dc.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DCH__
#define __DCH__
#ifndef _WX_DC_H_
#define _WX_DC_H_
#ifdef __GNUG__
#pragma interface "dc.h"
@@ -412,4 +412,4 @@ extern int wxPageNumber;
#endif
// __DCH__
// _WX_DC_H_

6
include/wx/msw/dcclient.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DCCLIENTH__
#define __DCCLIENTH__
#ifndef _WX_DCCLIENT_H_
#define _WX_DCCLIENT_H_
#ifdef __GNUG__
#pragma interface "dcclient.h"
@@ -62,4 +62,4 @@ class WXDLLEXPORT wxPaintDC: public wxDC
};
#endif
// __DCCLIENTH__
// _WX_DCCLIENT_H_

10
include/wx/msw/dcmemory.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DCMEMORYH__
#define __DCMEMORYH__
#ifndef _WX_DCMEMORY_H_
#define _WX_DCMEMORY_H_
#ifdef __GNUG__
#pragma interface "dcmemory.h"
@@ -32,4 +32,4 @@ class WXDLLEXPORT wxMemoryDC: public wxDC
};
#endif
// __DCMEMORYH__
// _WX_DCMEMORY_H_

10
include/wx/msw/dcprint.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DCPRINTH__
#define __DCPRINTH__
#ifndef _WX_DCPRINT_H_
#define _WX_DCPRINT_H_
#ifdef __GNUG__
#pragma interface "dcprint.h"
@@ -34,5 +34,5 @@ class WXDLLEXPORT wxPrinterDC: public wxDC
WXHDC WXDLLEXPORT wxGetPrinterDC(int orientation);
#endif
// __DCPRINTH__
// _WX_DCPRINT_H_

10
include/wx/msw/dcscreen.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DCSCREENH__
#define __DCSCREENH__
#ifndef _WX_DCSCREEN_H_
#define _WX_DCSCREEN_H_
#ifdef __GNUG__
#pragma interface "dcscreen.h"
@@ -35,5 +35,5 @@ class WXDLLEXPORT wxScreenDC: public wxDC
};
#endif
// __DCSCREENH__
// _WX_DCSCREEN_H_

10
include/wx/msw/dde.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DDEH__
#define __DDEH__
#ifndef _WX_DDE_H_
#define _WX_DDE_H_
#ifdef __GNUG__
#pragma interface "dde.h"
@@ -159,4 +159,4 @@ void WXDLLEXPORT wxDDECleanUp();
#endif
#endif
// __DDEH__
// _WX_DDE_H_

6
include/wx/msw/dialog.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __DIALOGH__
#define __DIALOGH__
#ifndef _WX_DIALOG_H_
#define _WX_DIALOG_H_
#ifdef __GNUG__
#pragma interface "dialog.h"
@@ -118,4 +118,4 @@ DECLARE_EVENT_TABLE()
};
#endif
// __DIALOGH__
// _WX_DIALOG_H_

4
include/wx/msw/dib.h
View File

@@ -5,8 +5,8 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Save (device dependent) wxBitmap as a DIB

2
include/wx/msw/dibutils.h
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Microsoft, Julian Smart
// Licence: wxWindows license
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
/***************************************************************************

10
include/wx/msw/dirdlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __DIRDLGH__
#define __DIRDLGH__
#ifndef _WX_DIRDLG_H_
#define _WX_DIRDLG_H_
#ifdef __GNUG__
#pragma interface "dirdlg.h"
@@ -44,4 +44,4 @@ protected:
};
#endif
// __DIRDLGH__
// _WX_DIRDLG_H_

10
include/wx/msw/filedlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __FILEDLGH__
#define __FILEDLGH__
#ifndef _WX_FILEDLG_H_
#define _WX_FILEDLG_H_
#ifdef __GNUG__
#pragma interface "filedlg.h"
@@ -86,4 +86,4 @@ char* WXDLLEXPORT wxLoadFileSelector(const char *what, const char *extension, co
char* WXDLLEXPORT wxSaveFileSelector(const char *what, const char *extension, const char *default_name = NULL, wxWindow *parent = NULL);
#endif
// __FILEDLGH__
// _WX_FILEDLG_H_

10
include/wx/msw/font.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __FONTH__
#define __FONTH__
#ifndef _WX_FONT_H_
#define _WX_FONT_H_
#ifdef __GNUG__
#pragma interface "font.h"
@@ -95,4 +95,4 @@ public:
};
#endif
// __FONTH__
// _WX_FONT_H_

32
include/wx/msw/fontdlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __FONTDLGH__
#define __FONTDLGH__
#ifndef _WX_FONTDLG_H_
#define _WX_FONTDLG_H_
#ifdef __GNUG__
#pragma interface "fontdlg.h"
@@ -25,20 +25,22 @@
class WXDLLEXPORT wxFontDialog: public wxDialog
{
DECLARE_DYNAMIC_CLASS(wxFontDialog)
protected:
wxWindow *dialogParent;
wxFontData fontData;
public:
wxFontDialog(void);
wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
DECLARE_DYNAMIC_CLASS(wxFontDialog)
bool Create(wxWindow *parent, wxFontData *data = NULL);
public:
wxFontDialog(void);
wxFontDialog(wxWindow *parent, wxFontData *data = NULL);
int ShowModal(void);
wxFontData& GetFontData(void) { return fontData; }
bool Create(wxWindow *parent, wxFontData *data = NULL);
int ShowModal(void);
wxFontData& GetFontData(void) { return m_fontData; }
protected:
wxWindow *m_dialogParent;
wxFontData m_fontData;
};
#endif
// __FONTDLGH__
// _WX_FONTDLG_H_

6
include/wx/msw/frame.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __FRAMEH__
#define __FRAMEH__
#ifndef _WX_FRAME_H_
#define _WX_FRAME_H_
#ifdef __GNUG__
#pragma interface "frame.h"
@@ -172,4 +172,4 @@ protected:
};
#endif
// __FRAMEH__
// _WX_FRAME_H_

10
include/wx/msw/gauge.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GAUGEH__
#define __GAUGEH__
#ifndef _WX_GAUGE_H_
#define _WX_GAUGE_H_
#ifdef __GNUG__
#pragma interface "gauge.h"
@@ -27,4 +27,4 @@
#endif
#endif
// __GAUGEH__
// _WX_GAUGE_H_

4
include/wx/msw/gauge95.h
View File

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

4
include/wx/msw/gaugemsw.h
View File

@@ -5,8 +5,8 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _GAUGEMSW_H_

10
include/wx/msw/gdiobj.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __GDIOBJH__
#define __GDIOBJH__
#ifndef _WX_GDIOBJ_H_
#define _WX_GDIOBJ_H_
#include "wx/object.h"
@@ -64,4 +64,4 @@ protected:
};
#endif
// __GDIOBJH__
// _WX_GDIOBJ_H_

10
include/wx/msw/helpwin.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __HELPWINH__
#define __HELPWINH__
#ifndef _WX_HELPWIN_H_
#define _WX_HELPWIN_H_
#ifdef __GNUG__
#pragma interface "helpwin.h"
@@ -51,4 +51,4 @@ protected:
#endif // USE_HELP
#endif
// __HELPWINH__
// _WX_HELPWIN_H_

10
include/wx/msw/icon.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __ICONH__
#define __ICONH__
#ifndef _WX_ICON_H_
#define _WX_ICON_H_
#ifdef __GNUG__
#pragma interface "icon.h"
@@ -99,4 +99,4 @@ public:
};
#endif
// __ICONH__
// _WX_ICON_H_

10
include/wx/msw/imaglist.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __IMAGLISTH__
#define __IMAGLISTH__
#ifndef _WX_IMAGLIST_H_
#define _WX_IMAGLIST_H_
#ifdef __GNUG__
#pragma interface "imaglist.h"
@@ -223,4 +223,4 @@ protected:
};
#endif
// __IMAGLISTH__
// _WX_IMAGLIST_H_

2
include/wx/msw/iniconf.h
View File

@@ -6,7 +6,7 @@
// Created: 27.07.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _INICONF_H

10
include/wx/msw/joystick.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __JOYSTICKH__
#define __JOYSTICKH__
#ifndef _WX_JOYSTICK_H_
#define _WX_JOYSTICK_H_
#ifdef __GNUG__
#pragma interface "joystick.h"
@@ -90,4 +90,4 @@ protected:
};
#endif
// __JOYSTICKH__
// _WX_JOYSTICK_H_

11
include/wx/msw/listbox.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __LISTBOXH__
#define __LISTBOXH__
#ifndef _WX_LISTBOX_H_
#define _WX_LISTBOX_H_
#ifdef __GNUG__
#pragma interface "listbox.h"
@@ -18,7 +18,6 @@
#include "wx/control.h"
WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
WXDLLEXPORT_DATA(extern const char*) wxListBoxNameStr;
#if USE_OWNER_DRAWN
@@ -134,4 +133,4 @@ class WXDLLEXPORT wxListBox: public wxControl
};
#endif
// __LISTBOXH__
// _WX_LISTBOX_H_

21
include/wx/msw/listctrl.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __LISTCTRLH__
#define __LISTCTRLH__
#ifndef _WX_LISTCTRL_H_
#define _WX_LISTCTRL_H_
#ifdef __GNUG__
#pragma interface "listctrl.h"
@@ -225,7 +225,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
int GetCountPerPage(void) const;
// Gets the edit control for editing labels.
wxTextCtrl& GetEditControl(void) const;
wxTextCtrl* GetEditControl(void) const;
// Gets information about the item
bool GetItem(wxListItem& info) const ;
@@ -341,8 +341,11 @@ class WXDLLEXPORT wxListCtrl: public wxControl
// Clears items, and columns if there are any.
void ClearAll(void);
// Edits a label
wxTextCtrl& Edit(long item) ;
// Edit the label
wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
// End label editing, optionally cancelling the edit
bool EndEditLabel(bool cancel);
// Ensures this item is visible
bool EnsureVisible(long item) ;
@@ -426,7 +429,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
char *AddPool(const wxString& str);
protected:
wxTextCtrl m_textCtrl; // The control used for editing a label
wxTextCtrl* m_textCtrl; // The control used for editing a label
wxImageList * m_imageListNormal; // The image list for normal icons
wxImageList * m_imageListSmall; // The image list for small icons
wxImageList * m_imageListState; // The image list state icons (not implemented yet)
@@ -473,4 +476,4 @@ typedef void (wxEvtHandler::*wxListEventFunction)(wxListEvent&);
#define EVT_LIST_COL_CLICK(id, fn) { wxEVT_COMMAND_LIST_COL_CLICK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxListEventFunction) & fn, NULL },
#endif
// __LISTCTRLH__
// _WX_LISTCTRL_H_

10
include/wx/msw/mdi.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MDIH__
#define __MDIH__
#ifndef _WX_MDI_H_
#define _WX_MDI_H_
#ifdef __GNUG__
#pragma interface "mdi.h"
@@ -206,4 +206,4 @@ DECLARE_EVENT_TABLE()
};
#endif
// __MDIH__
// _WX_MDI_H_

14
include/wx/msw/menu.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __MENUH__
#define __MENUH__
#ifndef _WX_MENU_H_
#define _WX_MENU_H_
#ifdef __GNUG__
#pragma interface "menu.h"
@@ -19,9 +19,9 @@
#include "wx/defs.h"
#include "wx/event.h"
class wxMenuItem;
class wxMenuBar;
class wxMenu;
class WXDLLEXPORT wxMenuItem;
class WXDLLEXPORT wxMenuBar;
class WXDLLEXPORT wxMenu;
WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
@@ -125,7 +125,7 @@ public:
// ----------------------------------------------------------------------------
// Menu Bar (a la Windows)
// ----------------------------------------------------------------------------
class wxFrame;
class WXDLLEXPORT wxFrame;
class WXDLLEXPORT wxMenuBar: public wxEvtHandler
{
DECLARE_DYNAMIC_CLASS(wxMenuBar)
@@ -177,4 +177,4 @@ public:
WXHMENU m_hMenu;
};
#endif // __MENUH__
#endif // _WX_MENU_H_

10
include/wx/msw/metafile.h
View File

@@ -5,13 +5,13 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __METAFIILEH__
#define __METAFIILEH__
#ifndef _WX_METAFIILE_H_
#define _WX_METAFIILE_H_
#ifdef __GNUG__
#pragma interface "metafile.h"
@@ -101,4 +101,4 @@ bool WXDLLEXPORT wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y
#endif // USE_METAFILE
#endif
// __METAFIILEH__
// _WX_METAFIILE_H_

10
include/wx/msw/minifram.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MINIFRAMH__
#define __MINIFRAMH__
#ifndef _WX_MINIFRAM_H_
#define _WX_MINIFRAM_H_
#ifdef __GNUG__
#pragma interface "minifram.h"
@@ -43,4 +43,4 @@ protected:
};
#endif
// __MINIFRAMH__
// _WX_MINIFRAM_H_

10
include/wx/msw/msgdlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __MSGBOXDLGH__
#define __MSGBOXDLGH__
#ifndef _WX_MSGBOXDLG_H_
#define _WX_MSGBOXDLG_H_
#ifdef __GNUG__
#pragma interface "msgdlg.h"
@@ -46,4 +46,4 @@ int WXDLLEXPORT wxMessageBox(const wxString& message, const wxString& caption =
wxWindow *parent = NULL, int x = -1, int y = -1);
#endif
// __MSGBOXDLGH__
// _WX_MSGBOXDLG_H_

8
include/wx/msw/ole/dataobj.h
View File

@@ -6,11 +6,11 @@
// Created: 10.05.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _OLEDATAOBJ_H
#define _OLEDATAOBJ_H
#ifndef _WX_OLEDATAOBJ_H
#define _WX_OLEDATAOBJ_H
// ----------------------------------------------------------------------------
// forward declarations
@@ -106,4 +106,4 @@ private:
// @@@ TODO: wx{Bitmap|Metafile|...}DataObject
// ----------------------------------------------------------------------------
#endif //_OLEDATAOBJ_H
#endif //_WX_OLEDATAOBJ_H

8
include/wx/msw/ole/dropsrc.h
View File

@@ -6,11 +6,11 @@
// Created: 06.03.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _OLEDROPSRC_H
#define _OLEDROPSRC_H
#ifndef _WX_OLEDROPSRC_H
#define _WX_OLEDROPSRC_H
#ifdef __GNUG__
#pragma interface
@@ -68,4 +68,4 @@ private:
wxIDropSource *m_pIDropSource; // the pointer to COM interface
};
#endif //_OLEDROPSRC_H
#endif //_WX_OLEDROPSRC_H

8
include/wx/msw/ole/droptgt.h
View File

@@ -6,14 +6,14 @@
// Created: 06.03.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
// ============================================================================
// prolog
// ============================================================================
#ifndef _OLEDROPTGT_H
#define _OLEDROPTGT_H
#ifndef _WX_OLEDROPTGT_H
#define _WX_OLEDROPTGT_H
#ifdef __GNUG__
#pragma interface "droptgt.h"
@@ -108,4 +108,4 @@ protected:
};
// ============================================================================
#endif //_OLEDROPTGT_H
#endif //_WX_OLEDROPTGT_H

8
include/wx/msw/ole/oleutils.h
View File

@@ -6,11 +6,11 @@
// Created: 19.02.1998
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _OLEUTILS_H
#define _OLEUTILS_H
#ifndef _WX_OLEUTILS_H
#define _WX_OLEUTILS_H
#ifdef __GNUG__
#pragma interface "oleutils.h"
@@ -143,4 +143,4 @@ void wxLogRelease(const char *szInterface, ULONG cRef);
#define wxLogRelease(szInterface, cRef)
#endif //WXDEBUG
#endif //_OLEUTILS_H
#endif //_WX_OLEUTILS_H

8
include/wx/msw/ole/uuid.h
View File

@@ -6,13 +6,13 @@
// Created: 11.07.97
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
//
// Notes: you should link your project with RPCRT4.LIB!
///////////////////////////////////////////////////////////////////////////////
#ifndef _OLEUUID_H
#define _OLEUUID_H
#ifndef _WX_OLEUUID_H
#define _WX_OLEUUID_H
#ifdef __GNUG__
#pragma interface "uuid.h"
@@ -88,4 +88,4 @@ public:
const char *CForm() const { return m_pszCForm; }
};
#endif //_OLEUUID_H
#endif //_WX_OLEUUID_H

10
include/wx/msw/palette.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __PALETTEH__
#define __PALETTEH__
#ifndef _WX_PALETTE_H_
#define _WX_PALETTE_H_
#ifdef __GNUG__
#pragma interface "palette.h"
@@ -63,4 +63,4 @@ public:
#define wxColourMap wxPalette
#endif
// __PALETTEH__
// _WX_PALETTE_H_

10
include/wx/msw/pen.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __PENH__
#define __PENH__
#ifndef _WX_PEN_H_
#define _WX_PEN_H_
#ifdef __GNUG__
#pragma interface "pen.h"
@@ -95,4 +95,4 @@ public:
int wx2msPenStyle(int wx_style);
#endif
// __PENH__
// _WX_PEN_H_

2
include/wx/msw/pnghand.h
View File

@@ -6,7 +6,7 @@
// Created: 04/01/98
// RCS-ID: $Id$
// Copyright: (c) Microsoft, Julian Smart
// Licence: wxWindows license
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__

4
include/wx/msw/pngread.h
View File

@@ -8,8 +8,8 @@
*
*/
#ifndef __PNGREAD__
#define __PNGREAD__
#ifndef _WX_PNGREAD__
#define _WX_PNGREAD__
#ifdef __GNUG__
#pragma interface "pngread.h"

10
include/wx/msw/printdlg.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __PRINTDLGH__
#define __PRINTDLGH__
#ifndef _WX_PRINTDLG_H_
#define _WX_PRINTDLG_H_
#ifdef __GNUG__
#pragma interface "printdlg.h"
@@ -68,4 +68,4 @@ class WXDLLEXPORT wxPageSetupDialog: public wxDialog
};
#endif
// __PRINTDLGH__
// _WX_PRINTDLG_H_

10
include/wx/msw/printwin.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __PRINTWINH__
#define __PRINTWINH__
#ifndef _WX_PRINTWIN_H_
#define _WX_PRINTWIN_H_
#ifdef __GNUG__
#pragma interface "printwin.h"
@@ -55,4 +55,4 @@ class WXDLLEXPORT wxWindowsPrintPreview: public wxPrintPreviewBase
};
#endif
// __PRINTWINH__
// _WX_PRINTWIN_H_

10
include/wx/msw/private.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __PRIVATEH__
#define __PRIVATEH__
#ifndef _WX_PRIVATE_H_
#define _WX_PRIVATE_H_
#include "wx/defs.h"
@@ -152,4 +152,4 @@ void WXDLLEXPORT wxAddControlHandle(WXHWND hWnd, wxWindow *item);
#endif
#endif
// __PRIVATEH__
// _WX_PRIVATE_H_

10
include/wx/msw/radiobox.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __RADIOBOXH__
#define __RADIOBOXH__
#ifndef _WX_RADIOBOX_H_
#define _WX_RADIOBOX_H_
#ifdef __GNUG__
#pragma interface "radiobox.h"
@@ -134,4 +134,4 @@ protected:
};
#endif
// __RADIOBOXH__
// _WX_RADIOBOX_H_

10
include/wx/msw/radiobut.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __RADIOBUTH__
#define __RADIOBUTH__
#ifndef _WX_RADIOBUT_H_
#define _WX_RADIOBUT_H_
#ifdef __GNUG__
#pragma interface "radiobut.h"
@@ -89,4 +89,4 @@ class WXDLLEXPORT wxBitmapRadioButton: public wxRadioButton
#endif
#endif
// __RADIOBUTH__
// _WX_RADIOBUT_H_

2
include/wx/msw/regconf.h
View File

@@ -6,7 +6,7 @@
// Created: 27.04.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _REGCONF_H

10
include/wx/msw/region.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __REGIONH__
#define __REGIONH__
#ifndef _WX_REGION_H_
#define _WX_REGION_H_
#ifdef __GNUG__
#pragma interface "region.h"
@@ -134,4 +134,4 @@ private:
};
#endif
// __REGIONH__
// _WX_REGION_H_

2
include/wx/msw/registry.h
View File

@@ -6,7 +6,7 @@
// Created: 03.04.198
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _REGISTRY_H

10
include/wx/msw/scrolbar.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __SCROLBARH__
#define __SCROLBARH__
#ifndef _WX_SCROLBAR_H_
#define _WX_SCROLBAR_H_
#ifdef __GNUG__
#pragma interface "scrolbar.h"
@@ -88,4 +88,4 @@ DECLARE_EVENT_TABLE()
};
#endif
// __SCROLBARH__
// _WX_SCROLBAR_H_

10
include/wx/msw/settings.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __SETTINGSH__
#define __SETTINGSH__
#ifndef _WX_SETTINGS_H_
#define _WX_SETTINGS_H_
#ifdef __GNUG__
#pragma interface "settings.h"
@@ -126,4 +126,4 @@ public:
};
#endif
// __SETTINGSH__
// _WX_SETTINGS_H_

12
include/wx/msw/setup.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __SETUPH__
#define __SETUPH__
#ifndef _WX_SETUP_H_
#define _WX_SETUP_H_
/*
* General features
@@ -19,7 +19,7 @@
#define USE_CONFIG 1
// Use wxConfig, with CreateConfig in wxApp
#define __GOODCOMPILER__
#define _WX_GOODCOMPILER__
// gcc can have problems, but Windows compilers
// are generally OK.
#define WXWIN_COMPATIBILITY 1
@@ -328,4 +328,4 @@
#endif
#endif
// __SETUPH__
// _WX_SETUP_H_

4
include/wx/msw/slider.h
View File

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

4
include/wx/msw/slider95.h
View File

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

4
include/wx/msw/slidrmsw.h
View File

@@ -5,8 +5,8 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _SLIDRMSW_H_

12
include/wx/msw/spinbutt.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __SPINBUTTH__
#define __SPINBUTTH__
#ifndef _WX_SPINBUTT_H_
#define _WX_SPINBUTT_H_
#ifdef __GNUG__
#pragma interface "spinbutt.h"
@@ -102,6 +102,6 @@ typedef void (wxEvtHandler::*wxSpinEventFunction)(wxSpinEvent&);
{ wxEVT_SCROLL_THUMBTRACK, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxSpinEventFunction) & func },
#endif
// __WIN95__
// _WX_WIN95__
#endif
// __SPINBUTTH__
// _WX_SPINBUTT_H_

10
include/wx/msw/statbmp.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __STATBMPH__
#define __STATBMPH__
#ifndef _WX_STATBMP_H_
#define _WX_STATBMP_H_
#ifdef __GNUG__
#pragma interface "statbmp.h"
@@ -64,4 +64,4 @@ class WXDLLEXPORT wxStaticBitmap: public wxControl
};
#endif
// __STATBMPH__
// _WX_STATBMP_H_

10
include/wx/msw/statbox.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __STATBOXH__
#define __STATBOXH__
#ifndef _WX_STATBOX_H_
#define _WX_STATBOX_H_
#ifdef __GNUG__
#pragma interface "statbox.h"
@@ -60,4 +60,4 @@ DECLARE_EVENT_TABLE()
};
#endif
// __STATBOXH__
// _WX_STATBOX_H_

2
include/wx/msw/statbr95.h
View File

@@ -6,7 +6,7 @@
// Created: 04.04.98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _STATBR95_H

10
include/wx/msw/stattext.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __STATTEXTH__
#define __STATTEXTH__
#ifndef _WX_STATTEXT_H_
#define _WX_STATTEXT_H_
#ifdef __GNUG__
#pragma interface "stattext.h"
@@ -61,4 +61,4 @@ class WXDLLEXPORT wxStaticText: public wxControl
};
#endif
// __STATTEXTH__
// _WX_STATTEXT_H_

10
include/wx/msw/tabctrl.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __TABCTRLH__
#define __TABCTRLH__
#ifndef _WX_TABCTRL_H_
#define _WX_TABCTRL_H_
#ifdef __GNUG__
#pragma interface "tabctrl.h"
@@ -150,4 +150,4 @@ typedef void (wxEvtHandler::*wxTabEventFunction)(wxTabEvent&);
id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTabEventFunction) & fn, NULL },
#endif
// __TABCTRLH__
// _WX_TABCTRL_H_

10
include/wx/msw/tbar95.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __TBAR95H__
#define __TBAR95H__
#ifndef _WX_TBAR95_H_
#define _WX_TBAR95_H_
#ifdef __GNUG__
#pragma interface "tbar95.h"
@@ -93,4 +93,4 @@ DECLARE_EVENT_TABLE()
#endif // USE_TOOL/BUTTONBAR
#endif
// __TBAR95H__
// _WX_TBAR95_H_

10
include/wx/msw/tbarmsw.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __TBARMSWH__
#define __TBARMSWH__
#ifndef _WX_TBARMSW_H_
#define _WX_TBARMSW_H_
#ifdef __GNUG__
#pragma interface "tbarmsw.h"
@@ -120,4 +120,4 @@ DECLARE_EVENT_TABLE()
#endif // USE_TOOL/BUTTONBAR
#endif
// __TBARMSWH__
// _WX_TBARMSW_H_

10
include/wx/msw/textctrl.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __TEXTCTRLH__
#define __TEXTCTRLH__
#ifndef _WX_TEXTCTRL_H_
#define _WX_TEXTCTRL_H_
#ifdef __GNUG__
#pragma interface "textctrl.h"
@@ -153,4 +153,4 @@ protected:
};
#endif
// __TEXTCTRLH__
// _WX_TEXTCTRL_H_

10
include/wx/msw/timer.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __TIMERH__
#define __TIMERH_
#ifndef _WX_TIMER_H_
#define _WX_TIMER_H_
#ifdef __GNUG__
#pragma interface "timer.h"
@@ -49,4 +49,4 @@ bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
long WXDLLEXPORT wxGetCurrentTime(void);
#endif
// __TIMERH_
// _WX_TIMERH_

22
include/wx/msw/treectrl.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifndef __TREECTRLH__
#define __TREECTRLH__
#ifndef _WX_TREECTRL_H_
#define _WX_TREECTRL_H_
#ifdef __GNUG__
#pragma interface "treectrl.h"
@@ -192,7 +192,7 @@ public:
// bounding rect
bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
//
wxTextCtrl& GetEditControl() const;
wxTextCtrl* GetEditControl() const;
// operations
// ----------
@@ -217,7 +217,13 @@ public:
bool SelectItem(long item);
bool ScrollTo(long item);
bool DeleteAllItems();
wxTextCtrl& Edit(long item);
// Edit the label (tree must have the focus)
wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = CLASSINFO(wxTextCtrl));
// End label editing, optionally cancelling the edit
bool EndEditLabel(bool cancel);
long HitTest(const wxPoint& point, int& flags);
// wxImageList *CreateDragImage(long item);
bool SortChildren(long item);
@@ -229,9 +235,9 @@ public:
bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
protected:
wxTextCtrl m_textCtrl;
wxImageList *m_imageListNormal;
wxImageList *m_imageListState;
wxTextCtrl* m_textCtrl;
wxImageList* m_imageListNormal;
wxImageList* m_imageListState;
DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
};
@@ -289,4 +295,4 @@ typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_COMMAND_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
#endif
// __TREECTRLH__
// _WX_TREECTRL_H_

8
include/wx/msw/wave.h
View File

@@ -5,12 +5,12 @@
// Modified by:
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart and Markus Holzem
// Licence: wxWindows license
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WAVEH__
#define __WAVEH__
#ifndef _WX_WAVE_H_
#define _WX_WAVE_H_
#ifdef __GNUG__
#pragma interface "wave.h"

35
include/wx/msw/window.h
View File

@@ -9,8 +9,8 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WINDOWH__
#define __WINDOWH__
#ifndef _WX_WINDOW_H_
#define _WX_WINDOW_H_
#ifdef __GNUG__
#pragma interface "window.h"
@@ -84,7 +84,6 @@ class WXDLLEXPORT wxWindow: public wxEvtHandler
{
DECLARE_ABSTRACT_CLASS(wxWindow)
friend class wxUpdateIterator;
friend class wxDC;
friend class wxPaintDC;
@@ -604,7 +603,7 @@ protected:
bool m_useCtl3D; // Using CTL3D for this control
bool m_inOnSize; // Protection against OnSize reentry
#ifndef __WIN32__
#ifndef _WX_WIN32__
// Pointer to global memory, for EDIT controls that need
// special treatment to reduce USER area consumption.
WXHGLOBAL m_globalHandle;
@@ -732,32 +731,6 @@ inline bool wxWindow::IsBeingDeleted(void) { return m_isBeingDeleted; }
// Window specific (so far)
wxWindow* WXDLLEXPORT wxGetActiveWindow(void);
// OBSOLETE
#if 0
// Allows iteration through damaged rectangles in OnPaint
class WXDLLEXPORT wxUpdateIterator
{
int rects; // How many rects in Update region
int current; // Current rectangle index
void *rp; // current rectangle
#ifdef __WIN32__
WXRGNDATA *rlist; // Storage for regiondata
#endif
public:
wxUpdateIterator(wxWindow* wnd);
~wxUpdateIterator(void);
operator int (void);
wxUpdateIterator* operator ++(int);
void GetRect(wxRectangle *rect);
int GetX();
int GetY();
int GetW();
int GetH();
};
#endif
WXDLLEXPORT_DATA(extern wxList) wxTopLevelWindows;
int WXDLLEXPORT wxCharCodeMSWToWX(int keySym);
@@ -767,4 +740,4 @@ int WXDLLEXPORT wxCharCodeWXToMSW(int id, bool *IsVirtual);
int WXDLLEXPORT NewControlId(void);
#endif
// __WINDOWH__
// _WX_WINDOW_H_

9
src/common/resource.cpp
View File

@@ -672,6 +672,10 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex
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);
@@ -1845,6 +1849,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
/* 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 },
@@ -1892,6 +1897,9 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
/* wxToolBar */
{ "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
{ "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
{ "wxTB_VERTICAL", wxTB_VERTICAL},
{ "wxTB_FLAT", wxTB_FLAT},
/* 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;
dialogBox->SetClientSize(width, height);
}
else
{

5
src/msw/app.cpp
View File

@@ -53,9 +53,11 @@
#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
*/
extern char *wxBuffer;
extern char *wxOsVersion;
@@ -430,12 +432,15 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_
{
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 (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT

16
src/msw/choice.cpp
View File

@@ -58,7 +58,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
SetForegroundColour(parent->GetDefaultForegroundColour()) ;
no_strings = n;
m_noStrings = n;
m_windowStyle = style;
@@ -121,19 +121,19 @@ void wxChoice::Append(const wxString& item)
{
SendMessage((HWND) GetHWND(), CB_ADDSTRING, 0, (LONG)(const char *)item);
no_strings ++;
m_noStrings ++;
}
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);
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 (no_strings == 0)
if (m_noStrings == 0)
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());
@@ -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)
{
if (no_strings == 0)
if (m_noStrings == 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...

20
src/msw/colordlg.cpp
View File

@@ -59,7 +59,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxColourDialog, wxDialog)
wxColourDialog::wxColourDialog(void)
{
dialogParent = NULL;
m_dialogParent = NULL;
}
wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
@@ -69,10 +69,10 @@ wxColourDialog::wxColourDialog(wxWindow *parent, wxColourData *data)
bool wxColourDialog::Create(wxWindow *parent, wxColourData *data)
{
dialogParent = parent;
m_dialogParent = parent;
if (data)
colourData = *data;
m_colourData = *data;
return TRUE;
}
@@ -84,16 +84,16 @@ int wxColourDialog::ShowModal(void)
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.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;
if (!colourData.GetChooseFull())
if (!m_colourData.GetChooseFull())
chooseColorStruct.Flags |= CC_PREVENTFULLOPEN;
// Do the modal dialog
@@ -112,11 +112,11 @@ int wxColourDialog::ShowModal(void)
// 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]));
}
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;

2
src/msw/combobox.cpp
View File

@@ -71,7 +71,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
if (parent) parent->AddChild(this);
SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
SetForegroundColour(parent->GetDefaultForegroundColour()) ;
no_strings = n;
m_noStrings = n;
m_windowStyle = style;

2
src/msw/dialog.cpp
View File

@@ -59,7 +59,7 @@ END_EVENT_TABLE()
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)

32
src/msw/fontdlg.cpp
View File

@@ -56,7 +56,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFontDialog, wxDialog)
wxFontDialog::wxFontDialog(void)
{
dialogParent = NULL;
m_dialogParent = NULL;
}
wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
@@ -66,10 +66,10 @@ wxFontDialog::wxFontDialog(wxWindow *parent, wxFontData *data)
bool wxFontDialog::Create(wxWindow *parent, wxFontData *data)
{
dialogParent = parent;
m_dialogParent = parent;
if (data)
fontData = *data;
m_fontData = *data;
return TRUE;
}
@@ -83,28 +83,28 @@ int wxFontDialog::ShowModal(void)
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;
if (fontData.initialFont.Ok())
if (m_fontData.initialFont.Ok())
{
flags |= CF_INITTOLOGFONTSTRUCT;
wxFillLogFont(&logFont, & fontData.initialFont);
wxFillLogFont(&logFont, & m_fontData.initialFont);
}
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;
if (fontData.GetEnableEffects())
if (m_fontData.GetEnableEffects())
flags |= CF_EFFECTS;
if (fontData.GetShowHelp())
if (m_fontData.GetShowHelp())
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;
}
@@ -115,9 +115,9 @@ int wxFontDialog::ShowModal(void)
// 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));
fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
m_fontData.chosenFont = wxCreateFontFromLogFont(&logFont);
}
return success ? wxID_OK : wxID_CANCEL;

61
src/msw/listctrl.cpp
View File

@@ -54,6 +54,7 @@ wxListCtrl::wxListCtrl(void)
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,
@@ -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_textCtrl = NULL;
m_colCount = 0;
wxSystemSettings settings;
@@ -129,7 +131,13 @@ bool wxListCtrl::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, con
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
@@ -441,11 +449,9 @@ int wxListCtrl::GetCountPerPage(void) const
}
// 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
@@ -806,14 +812,49 @@ void wxListCtrl::ClearAll(void)
DeleteAllColumns();
}
// Edits a label
wxTextCtrl& wxListCtrl::Edit(long item)
wxTextCtrl* wxListCtrl::EditLabel(long item, wxClassInfo* textControlClass)
{
HWND hWnd = (HWND) ListView_EditLabel((HWND) GetHWND(), (int) item);
m_textCtrl.SetHWND((WXHWND) hWnd);
return m_textCtrl;
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)
{
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)
{

2
src/msw/mdi.cpp
View File

@@ -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)
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);
}

2
src/msw/minifram.cpp
View File

@@ -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 )
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);
}

52
src/msw/treectrl.cpp
View File

@@ -53,6 +53,7 @@ wxTreeCtrl::wxTreeCtrl(void)
{
m_imageListNormal = NULL;
m_imageListState = NULL;
m_textCtrl = NULL;
}
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_textCtrl = NULL;
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)
{
m_textCtrl.SetHWND((WXHWND) NULL);
if (m_textCtrl)
{
m_textCtrl->UnsubclassWin();
m_textCtrl->SetHWND((WXHWND) 0);
delete m_textCtrl;
}
}
// Attributes
@@ -412,11 +419,9 @@ bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
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
@@ -527,11 +532,40 @@ bool wxTreeCtrl::DeleteAllItems(void)
return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
}
wxTextCtrl& wxTreeCtrl::Edit(long item)
wxTextCtrl* wxTreeCtrl::EditLabel(long item, wxClassInfo* textControlClass)
{
HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
m_textCtrl.SetHWND((WXHWND) hWnd);
return m_textCtrl;
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)
{
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)

2
src/msw/window.cpp
View File

@@ -1874,7 +1874,7 @@ void wxWindow::OnSysColourChanged(wxSysColourChangedEvent& event)
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);
}

2
utils/dialoged/src/makefile.b32
View File

@@ -38,7 +38,7 @@ DEBUG_FLAGS =
!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) @&&!

8
utils/dialoged/src/makefile.g95
View File

@@ -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)\
$(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
@@ -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)/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)

Some files were not shown because too many files have changed in this diff Show More