diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-03 20:45:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-03 20:45:19 (GMT) |
| commit | 1a1f6bb851a8f05fd555d9e28bc01edea61adef5 (patch) | |
| tree | d2ec5c7ee367cb99fde43021fb976b73dc6ab55f /generic/tk.h | |
| parent | 769c871f62cd237acec5479e978538048a44ffa7 (diff) | |
| download | tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.zip tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.tar.gz tk-1a1f6bb851a8f05fd555d9e28bc01edea61adef5.tar.bz2 | |
Consolidate Tk 8.7 error-messages regarding TIP #581. More Master -> Container related (internal) changes
Diffstat (limited to 'generic/tk.h')
| -rw-r--r-- | generic/tk.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tk.h b/generic/tk.h index 8b0619d..9672110 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -122,14 +122,14 @@ extern "C" { * Dummy types that are used by clients: */ -#define Tk_ImageModel Tk_ImageMaster +#define Tk_ImageMaster Tk_ImageModel typedef struct Tk_BindingTable_ *Tk_BindingTable; typedef struct Tk_Canvas_ *Tk_Canvas; typedef struct Tk_Cursor_ *Tk_Cursor; typedef struct Tk_ErrorHandler_ *Tk_ErrorHandler; typedef struct Tk_Font_ *Tk_Font; typedef struct Tk_Image__ *Tk_Image; -typedef struct Tk_ImageMaster_ *Tk_ImageModel; +typedef struct Tk_ImageModel_ *Tk_ImageModel; typedef struct Tk_OptionTable_ *Tk_OptionTable; typedef struct Tk_PostscriptInfo_ *Tk_PostscriptInfo; typedef struct Tk_TextLayout_ *Tk_TextLayout; @@ -651,7 +651,7 @@ typedef struct Tk_ClassProcs { * the geometry manager to carry out certain functions. */ -#define Tk_GeomLostContentProc Tk_GeomLostSlaveProc +#define Tk_GeomLostSlaveProc Tk_GeomLostContentProc typedef void (Tk_GeomRequestProc) (ClientData clientData, Tk_Window tkwin); typedef void (Tk_GeomLostContentProc) (ClientData clientData, Tk_Window tkwin); @@ -662,7 +662,7 @@ typedef struct Tk_GeomMgr { Tk_GeomRequestProc *requestProc; /* Procedure to invoke when a slave's * requested geometry changes. */ - Tk_GeomLostContentProc *lostSlaveProc; + Tk_GeomLostContentProc *lostContentProc; /* Procedure to invoke when a slave is taken * away from one geometry manager by another. * NULL means geometry manager doesn't care |